boehm-gc: revert all CACAO-specific modifications; this is now an exact copy of the...

[cacao.git] / src / mm / boehm-gc / include / gc_pthread_redirects.h

diff --git a/src/mm/boehm-gc/include/gc_pthread_redirects.h b/src/mm/boehm-gc/include/gc_pthread_redirects.h
index 21e9c9fa605fc15e4f3c29ce7a21861c226aa7fd..8925c852e7ac726f2e36c77ca3ba2a23f2fec12a 100644 (file)
--- a/src/mm/boehm-gc/include/gc_pthread_redirects.h
+++ b/src/mm/boehm-gc/include/gc_pthread_redirects.h
@@ -5,55 +5,29 @@
 
 #define GC_PTHREAD_REDIRECTS_H
 
-#if defined(GC_SOLARIS_THREADS)
-/* We need to intercept calls to many of the threads primitives, so    */
-/* that we can locate thread stacks and stop the world.                        */
-/* Note also that the collector cannot see thread specific data.       */
-/* Thread specific data should generally consist of pointers to                */
-/* uncollectable objects (allocated with GC_malloc_uncollectable,      */
-/* not the system malloc), which are deallocated using the destructor  */
-/* facility in thr_keycreate.  Alternatively, keep a redundant pointer */
-/* to thread specific data on the thread stack.                                */
-# include <thread.h>
-  int GC_thr_create(void *stack_base, size_t stack_size,
-                    void *(*start_routine)(void *), void *arg, long flags,
-                    thread_t *new_thread);
-  int GC_thr_join(thread_t wait_for, thread_t *departed, void **status);
-  int GC_thr_suspend(thread_t target_thread);
-  int GC_thr_continue(thread_t target_thread);
-  void * GC_dlopen(const char *path, int mode);
-# define thr_create GC_thr_create
-# define thr_join GC_thr_join
-# define thr_suspend GC_thr_suspend
-# define thr_continue GC_thr_continue
-#endif /* GC_SOLARIS_THREADS */
+#if !defined(GC_USE_LD_WRAP) && defined(GC_PTHREADS)
+/* We need to intercept calls to many of the threads primitives, so     */
+/* that we can locate thread stacks and stop the world.                  */
+/* Note also that the collector cannot always see thread specific data.  */
+/* Thread specific data should generally consist of pointers to          */
+/* uncollectable objects (allocated with GC_malloc_uncollectable,        */
+/* not the system malloc), which are deallocated using the destructor    */
+/* facility in thr_keycreate.  Alternatively, keep a redundant pointer   */
+/* to thread specific data on the thread stack.                         */
 
-#if defined(GC_SOLARIS_PTHREADS)
 # include <pthread.h>
 # include <signal.h>
-  extern int GC_pthread_create(pthread_t *new_thread,
-                                const pthread_attr_t *attr,
-                                void * (*thread_execp)(void *), void *arg);
-  extern int GC_pthread_join(pthread_t wait_for, void **status);
-# define pthread_join GC_pthread_join
-# define pthread_create GC_pthread_create
-#endif
-
-#if defined(GC_SOLARIS_PTHREADS) || defined(GC_SOLARIS_THREADS)
-# define dlopen GC_dlopen
-#endif /* SOLARIS_THREADS || SOLARIS_PTHREADS */
-
 
-#if !defined(GC_USE_LD_WRAP) && defined(GC_PTHREADS) && !defined(GC_SOLARIS_PTHREADS)
-/* We treat these similarly. */
-# include <pthread.h>
-# include <signal.h>
+# ifndef GC_DARWIN_THREADS
+#   include <dlfcn.h>
+# endif
 
   int GC_pthread_create(pthread_t *new_thread,
                         const pthread_attr_t *attr,
                        void *(*start_routine)(void *), void *arg);
 #ifndef GC_DARWIN_THREADS
-  int GC_pthread_sigmask(int how, const sigset_t *set, sigset_t *oset);
+    int GC_pthread_sigmask(int how, const sigset_t *set, sigset_t *oset);
+    void *GC_dlopen(const char *path, int mode);
 #endif
   int GC_pthread_join(pthread_t thread, void **retval);
   int GC_pthread_detach(pthread_t thread);
@@ -77,9 +51,12 @@
 #  undef pthread_sigmask
 # endif         /* pthread_sigmask */
 # define pthread_sigmask GC_pthread_sigmask
+# ifdef dlopen
+#  undef dlopen
+# endif
 # define dlopen GC_dlopen
 #endif
 
-#endif /* GC_xxxxx_THREADS */
+#endif /* GC_PTHREADS && !GC_USE_LD_WRAP */
 
 #endif /* GC_PTHREAD_REDIRECTS_H */