From 6237335fec273ac2b00c32609a8eef91c6ec7473 Mon Sep 17 00:00:00 2001 From: rpj Date: Sat, 23 Jan 1999 06:58:47 +0000 Subject: Fixing problems building with GNU compilers: Sun Jan 24 01:34:52 1999 Ross Johnson * semaphore.c (sem_wait): Remove second arg to pthreadCancelableWait() call. Fri Jan 22 14:31:59 1999 Ross Johnson * Makefile.in (CFLAGS): Remove -fhandle-exceptions. Not needed with egcs. Add -g for debugging. * create.c (pthread_create): Replace __stdcall with PT_STDCALL macro. This is a hack and must be fixed. * misc.c (CancelableWait): Remove redundant statement. * mutex.c (pthread_mutexattr_init): Cast calloc return value. * misc.c (CancelableWait): Add cast. (pthread_self): Add cast. * exit.c (pthread_exit): Add cast. * condvar.c (pthread_condattr_init): Cast calloc return value. * cleanup.c: Reorganise conditional compilation. * attr.c (pthread_attr_init): Remove unused 'result'. Cast malloc return value. * private.c (_pthread_callUserDestroyRoutines): Redo conditional compilation. * misc.c (CancelableWait): C++ version uses 'throw'. * cancel.c (pthread_testcancel): Ditto. * implement.h (class pthread_exception): Define for C++. * pthread.h: Fix C, C++, and Win32 SEH condition compilation mayhem around pthread_cleanup_* defines. C++ version now uses John Bossom's cleanup handlers. (pthread_attr_t): Make 'valid' unsigned. Define '_timeb' as 'timeb' for Ming32. Define PT_STDCALL as nothing for Mingw32. May be temporary. * cancel.c (pthread_testcancel): Cast return value. --- implement.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'implement.h') diff --git a/implement.h b/implement.h index f897033..75ca6f6 100644 --- a/implement.h +++ b/implement.h @@ -84,6 +84,7 @@ struct ThreadKeyAssoc { }; +#ifdef _MSC_VER /* * -------------------------------------------------------------- * MAKE_SOFTWARE_EXCEPTION @@ -127,6 +128,21 @@ struct ThreadKeyAssoc { #define PTHREAD_SERVICES_FACILITY 0xBAD #define PTHREAD_SERVICES_ERROR 0xDEED +#else + +#ifdef __cplusplus + +class Pthread_exception {}; + +extern Pthread_exception pthread_exception; + +#else /* __cplusplus */ + +#warning File __FILE__, Line __LINE__: Cancellation not supported under C. + +#endif /* __cplusplus */ + +#endif /* _MSC_VER */ /* Function pointer to TryEnterCriticalSection if it exists; otherwise NULL */ extern BOOL (WINAPI *_pthread_try_enter_critical_section)(LPCRITICAL_SECTION); -- cgit v1.2.3