From cc29ad943903e9b8dba96cd978cb126f79f73e38 Mon Sep 17 00:00:00 2001 From: rpj Date: Tue, 2 Feb 1999 02:01:56 +0000 Subject: Mods to compile under Mingw32 egcs. Tue Feb 2 18:07:43 1999 Ross Johnson * implement.h: Add #include . Change sem_t to _pthread_sem_t. Various patches by Kevin Ruland * signal.c (pthread_sigmask): Add and modify casts. Reverse LHS/RHS bitwise assignments. * pthread.h: Remove #include . (_PTHREAD_ATTR_VALID): Add cast. (struct pthread_t_): Add sigmask element. * dll.c: Add "extern C" for DLLMain. (DllMain): Add cast. * create.c (pthread_create): Set sigmask in thread. * condvar.c: Remove #include. Change sem_* to _pthread_sem_*. * attr.c: Changed #include. * Makefile.in: Additional targets and changes to build the library as a DLL. Fri Jan 29 11:56:28 1999 Ross Johnson * Makefile.in (OBJS): Add semaphore.o to list. * semaphore.c (_pthread_sem_timedwait): Move from private.c. Rename sem_* to _pthread_sem_*. * pthread.h (pthread_cond_t): Change type of sem_t. _POSIX_SEMAPHORES no longer defined. * semaphore.h: Contents moved to implement.h. Removed from source tree. * implement.h: Add semaphore function prototypes and ename all functions to prepend '_pthread_'. They are now private to the pthreads-win32 implementation. * private.c: Change #warning. Move _pthread_sem_timedwait() to semaphore.c. * cleanup.c: Change #warning. * misc.c: Remove #include * pthread.def: Cleanup CVS merge conflicts. * global.c: Ditto. * ChangeLog: Ditto. * cleanup.c: Ditto. --- cleanup.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'cleanup.c') diff --git a/cleanup.c b/cleanup.c index 3a1613c..012b82e 100644 --- a/cleanup.c +++ b/cleanup.c @@ -6,7 +6,11 @@ * threads. */ -#include +#if !defined(_MSC_VER) && !defined(__cplusplus) && defined(__GNUC__) + +#warning Compile __FILE__ as C++ or thread cancellation will not work properly. + +#endif /* !_MSC_VER && !__cplusplus && __GNUC__ */ #include "pthread.h" #include "implement.h" @@ -91,10 +95,6 @@ _pthread_pop_cleanup (int execute) #else /* __cplusplus */ -#if defined(__GNUC__) -#warning Compile __FILE__ as C++ or thread cancellation will not work properly. -#endif - /* * Run the caller's cleanup routine and FIXME: hope for the best. */ @@ -110,7 +110,7 @@ _pthread_pop_cleanup (int execute) pthread_setspecific (_pthread_cleanupKey, (void *) cleanup->prev); -#endif +#endif /* !_MSC_VER && !__cplusplus */ } @@ -170,7 +170,7 @@ _pthread_push_cleanup (_pthread_cleanup_t * cleanup, cleanup->prev = (_pthread_cleanup_t *) pthread_getspecific (_pthread_cleanupKey); -#endif +#endif /* !_MSC_VER && !__cplusplus */ pthread_setspecific (_pthread_cleanupKey, (void *) cleanup); -- cgit v1.2.3