X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=thread.h;h=309d388cb36b2be2223dc1b7a820352dff6f71a8;hb=40a073c6ab81a3dc2050daf4e83d5bff8cbe147b;hp=f36e7a2ad7e89535b1fbbc3eed71444f8e9c0edf;hpb=3fcd5a54ee9a769b0df77dcf2827b3be2e6ddbd1;p=p5sagit%2Fp5-mst-13.2.git diff --git a/thread.h b/thread.h index f36e7a2..309d388 100644 --- a/thread.h +++ b/thread.h @@ -1,4 +1,4 @@ -#if defined(USE_THREADS) || defined(USE_ITHREADS) +#if defined(USE_5005THREADS) || defined(USE_ITHREADS) #if defined(VMS) #include @@ -303,11 +303,13 @@ #endif #ifndef PTHREAD_ATFORK -typedef void(*Perl_pthread_atfork_t)(void); -# define PTHREAD_ATFORK(prepare,parent,child) \ - pthread_atfork((Perl_pthread_atfork_t)prepare,\ - (Perl_pthread_atfork_t)parent,\ - (Perl_pthread_atfork_t)child) +# ifdef HAS_PTHREAD_ATFORK +# define PTHREAD_ATFORK(prepare,parent,child) \ + pthread_atfork(prepare,parent,child) +# else +# define PTHREAD_ATFORK(prepare,parent,child) \ + NOOP +# endif #endif #ifndef THREAD_RET_TYPE @@ -315,7 +317,7 @@ typedef void(*Perl_pthread_atfork_t)(void); # define THREAD_RET_CAST(p) ((void *)(p)) #endif /* THREAD_RET */ -#if defined(USE_THREADS) +#if defined(USE_5005THREADS) /* Accessor for per-thread SVs */ # define THREADSV(i) (thr->threadsvp[i]) @@ -369,8 +371,8 @@ typedef struct condpair { #define MgCONDP(mg) (&((condpair_t *)(mg->mg_ptr))->cond) #define MgOWNER(mg) ((condpair_t *)(mg->mg_ptr))->owner -#endif /* USE_THREADS */ -#endif /* USE_THREADS || USE_ITHREADS */ +#endif /* USE_5005THREADS */ +#endif /* USE_5005THREADS || USE_ITHREADS */ #ifndef MUTEX_LOCK # define MUTEX_LOCK(m) @@ -464,7 +466,3 @@ typedef struct condpair { #ifndef INIT_THREADS # define INIT_THREADS NOOP #endif - -#ifndef PTHREAD_ATFORK -# define PTHREAD_ATFORK(prepare,parent,child) NOOP -#endif