diff options
author | Neil Jerram <neil@ossau.uklinux.net> | 2009-08-05 16:13:28 +0100 |
---|---|---|
committer | Neil Jerram <neil@ossau.uklinux.net> | 2009-08-21 23:29:08 +0100 |
commit | a4dbe1ac3dacf365263023c4fe1cd6ffb4a894b7 (patch) | |
tree | c2ac7763ec1dd7ed02196ef1e4c29565a7b21683 /libguile/continuations.c | |
parent | d5ed380ec83a2f42cacc40697717679bf03e6857 (diff) | |
download | guile-a4dbe1ac3dacf365263023c4fe1cd6ffb4a894b7.tar.gz |
Avoid clash with system setjmp/longjmp on IA64
Problem was that if an application includes both libguile.h and the
system's setjmp.h, and is compiled on IA64, it gets compile errors
because of jmp_buf, setjmp and longjmp being multiply defined.
* libguile/__scm.h (__ia64__): Define scm_i_jmp_buf, SCM_I_SETJMP and
SCM_I_LONGJMP instead of jmp_buf, setjmp and longjmp.
(all other platforms): Map scm_i_jmp_buf, SCM_I_SETJMP and
SCM_I_LONGJMP to jmp_buf, setjmp and longjmp.
* libguile/continuations.c (scm_make_continuation): Use `SCM_I_SETJMP'
instead of `setjmp'.
(copy_stack_and_call): Use `SCM_I_LONJMP' instead of `longjmp'.
(scm_ia64_longjmp): Use type `scm_i_jmp_buf' instead of `jmp_buf'.
* libguile/continuations.h (scm_t_contregs): Use type `scm_i_jmp_buf'
instead of `jmp_buf'.
* libguile/threads.c (suspend): Use `SCM_I_SETJMP' instead of
`setjmp'.
* libguile/threads.h (scm_i_thread): Use type `scm_i_jmp_buf' instead
of `jmp_buf'.
* libguile/throw.c (JBJMPBUF, make_jmpbuf, jmp_buf_and_retval): Use
type `scm_i_jmp_buf' instead of `jmp_buf'.
(scm_c_catch): Use `SCM_I_SETJMP' instead of `setjmp'.
(scm_ithrow): Use `SCM_I_LONGJMP' instead of `longjmp'.
Diffstat (limited to 'libguile/continuations.c')
-rw-r--r-- | libguile/continuations.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libguile/continuations.c b/libguile/continuations.c index f85647684..347bd8027 100644 --- a/libguile/continuations.c +++ b/libguile/continuations.c @@ -131,7 +131,7 @@ scm_make_continuation (int *first) SCM_NEWSMOB (cont, scm_tc16_continuation, continuation); - *first = !setjmp (continuation->jmpbuf); + *first = !SCM_I_SETJMP (continuation->jmpbuf); if (*first) { #ifdef __ia64__ @@ -229,12 +229,12 @@ copy_stack_and_call (scm_t_contregs *continuation, SCM val, scm_i_set_last_debug_frame (continuation->dframe); continuation->throw_value = val; - longjmp (continuation->jmpbuf, 1); + SCM_I_LONGJMP (continuation->jmpbuf, 1); } #ifdef __ia64__ void -scm_ia64_longjmp (jmp_buf *JB, int VAL) +scm_ia64_longjmp (scm_i_jmp_buf *JB, int VAL) { scm_i_thread *t = SCM_I_CURRENT_THREAD; |