diff options
author | Ludovic Courtès <ludo@gnu.org> | 2008-09-10 22:51:46 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2008-09-10 22:51:46 +0200 |
commit | e0513d4d77a7dbf42252a5dddfee62c46a700b9c (patch) | |
tree | 09066826f011a3f4fb6aec31e577773af1f85334 /libguile/pthread-threads.h | |
parent | 6774820f1e83a388b3232cd61a66340886b395d8 (diff) | |
parent | 2e77f7202b11ad0003831fcff94ec7db80cca015 (diff) | |
download | guile-e0513d4d77a7dbf42252a5dddfee62c46a700b9c.tar.gz |
Merge commit '2e77f7202b11ad0003831fcff94ec7db80cca015' into boehm-demers-weiser-gc
Conflicts:
libguile/threads.c
Diffstat (limited to 'libguile/pthread-threads.h')
-rw-r--r-- | libguile/pthread-threads.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libguile/pthread-threads.h b/libguile/pthread-threads.h index 5f652252a..bd6d4854d 100644 --- a/libguile/pthread-threads.h +++ b/libguile/pthread-threads.h @@ -38,6 +38,9 @@ #define scm_i_pthread_create pthread_create #define scm_i_pthread_detach pthread_detach #define scm_i_pthread_exit pthread_exit +#define scm_i_pthread_cancel pthread_cancel +#define scm_i_pthread_cleanup_push pthread_cleanup_push +#define scm_i_pthread_cleanup_pop pthread_cleanup_pop #define scm_i_sched_yield sched_yield /* Signals @@ -46,7 +49,11 @@ /* Mutexes */ -#define SCM_I_PTHREAD_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER +#if SCM_NEED_BRACES_ON_PTHREAD_MUTEX_INITIALIZER +# define SCM_I_PTHREAD_MUTEX_INITIALIZER { PTHREAD_MUTEX_INITIALIZER } +#else +# define SCM_I_PTHREAD_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER +#endif #define scm_i_pthread_mutex_t pthread_mutex_t #define scm_i_pthread_mutex_init pthread_mutex_init #define scm_i_pthread_mutex_destroy pthread_mutex_destroy |