summaryrefslogtreecommitdiff
path: root/cancel.c
diff options
context:
space:
mode:
authorrpj <rpj>1999-01-23 06:58:47 +0000
committerrpj <rpj>1999-01-23 06:58:47 +0000
commit6237335fec273ac2b00c32609a8eef91c6ec7473 (patch)
tree11a0048f90cda86fc653ac525b63650759e423cc /cancel.c
parent984d83b8c134a4dde2dddb31564d3d47b0da8c25 (diff)
Fixing problems building with GNU compilers:
Sun Jan 24 01:34:52 1999 Ross Johnson <rpj@ixobrychus.canberra.edu.au> * semaphore.c (sem_wait): Remove second arg to pthreadCancelableWait() call. Fri Jan 22 14:31:59 1999 Ross Johnson <rpj@swan.canberra.edu.au> * 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.
Diffstat (limited to 'cancel.c')
-rw-r--r--cancel.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/cancel.c b/cancel.c
index 93d6e07..5b7ff1a 100644
--- a/cancel.c
+++ b/cancel.c
@@ -163,7 +163,8 @@ pthread_testcancel (void)
{
pthread_t self;
- if ((self = pthread_getspecific (_pthread_selfThreadKey)) != NULL)
+ if ((self = (pthread_t) pthread_getspecific (_pthread_selfThreadKey))
+ != NULL)
{
if (self->cancelState == PTHREAD_CANCEL_ENABLE)
@@ -175,6 +176,9 @@ pthread_testcancel (void)
/*
* Canceling!
*/
+
+#ifdef _MSC_VER
+
DWORD exceptionInformation[3];
exceptionInformation[0] = (DWORD) (0);
@@ -185,6 +189,17 @@ pthread_testcancel (void)
0,
3,
exceptionInformation);
+
+#else /* _MSC_VER */
+
+#ifdef __cplusplus
+
+ throw pthread_exception;
+
+#endif /* __cplusplus */
+
+#endif /* _MSC_VER */
+
}
}
}