summaryrefslogtreecommitdiff
path: root/libguile/pthread-threads.h
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2011-05-26 18:43:09 +0200
committerAndy Wingo <wingo@pobox.com>2011-05-26 18:43:09 +0200
commit1b679a82e1d87e8bf10033292de6e53309057217 (patch)
tree32ef0ffe2b454a2117da22c2b20b0054479eed8e /libguile/pthread-threads.h
parentee395b7cfbd020338e4063fe5513945ddfda48eb (diff)
downloadguile-1b679a82e1d87e8bf10033292de6e53309057217.tar.gz
remove gc pthread redirects entirely
* libguile/pthread-threads.h: As an experiment, just define scm_i_pthread_create et al to their pthread_* functions, instead of the GC_ ones. It seems sufficient, given that all uses of Guile have to go through scm_with_guile anyway... Passes tests on my machine. Committing to give buildbots a go at it.
Diffstat (limited to 'libguile/pthread-threads.h')
-rw-r--r--libguile/pthread-threads.h20
1 files changed, 2 insertions, 18 deletions
diff --git a/libguile/pthread-threads.h b/libguile/pthread-threads.h
index 4c67b1857..b5fae4e89 100644
--- a/libguile/pthread-threads.h
+++ b/libguile/pthread-threads.h
@@ -29,27 +29,15 @@
#include <pthread.h>
#include <sched.h>
-/* `libgc' defines wrapper procedures for pthread calls. */
-#include "libguile/bdw-gc.h"
-
/* Threads
*/
#define scm_i_pthread_t pthread_t
#define scm_i_pthread_self pthread_self
-#define scm_i_pthread_create GC_pthread_create
-#define scm_i_pthread_detach GC_pthread_detach
+#define scm_i_pthread_create pthread_create
+#define scm_i_pthread_detach pthread_detach
-#if SCM_HAVE_GC_PTHREAD_EXIT
-#define scm_i_pthread_exit GC_pthread_exit
-#else
#define scm_i_pthread_exit pthread_exit
-#endif
-
-#if SCM_HAVE_GC_PTHREAD_CANCEL
-#define scm_i_pthread_cancel GC_pthread_cancel
-#else
#define scm_i_pthread_cancel pthread_cancel
-#endif
#define scm_i_pthread_cleanup_push pthread_cleanup_push
#define scm_i_pthread_cleanup_pop pthread_cleanup_pop
@@ -57,11 +45,7 @@
/* Signals
*/
-#if SCM_HAVE_GC_PTHREAD_SIGMASK
-#define scm_i_pthread_sigmask GC_pthread_sigmask
-#else
#define scm_i_pthread_sigmask pthread_sigmask
-#endif
/* Mutexes
*/