=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/gc/solaris_pthreads.c,v retrieving revision 1.2 retrieving revision 1.5 diff -u -p -r1.2 -r1.5 --- OpenXM_contrib2/asir2000/gc/solaris_pthreads.c 2000/12/01 09:26:13 1.2 +++ OpenXM_contrib2/asir2000/gc/solaris_pthreads.c 2002/07/24 08:00:12 1.5 @@ -13,13 +13,11 @@ /* * Support code for Solaris threads. Provides functionality we wish Sun * had provided. Relies on some information we probably shouldn't rely on. - * Modified Peter C. for Solaris Posix Threads. + * Modified by Peter C. for Solaris Posix Threads. */ -/* Boehm, September 14, 1994 4:44 pm PDT */ -/* $Id: solaris_pthreads.c,v 1.2 2000/12/01 09:26:13 noro Exp $ */ -# if defined(_SOLARIS_PTHREADS) -# include "gc_priv.h" +# if defined(GC_SOLARIS_PTHREADS) +# include "private/gc_priv.h" # include # include # include @@ -36,7 +34,7 @@ # define _CLASSIC_XOPEN_TYPES # include # include -# include "solaris_threads.h" +# include "private/solaris_threads.h" # include #undef pthread_join @@ -89,8 +87,8 @@ GC_pthread_create(pthread_t *new_thread, } LOCK(); - if (!GC_thr_initialized) { - GC_thr_init(); + if (!GC_is_initialized) { + GC_init_inner(); } GC_multithreaded++; @@ -176,5 +174,5 @@ GC_pthread_create(pthread_t *new_thread, int GC_no_sunOS_pthreads; #endif -# endif /* SOLARIS_THREADS */ +# endif /* GC_SOLARIS_PTHREADS */