From a3db256e9e64a55e53e051756b3c1a6b6328c529 Mon Sep 17 00:00:00 2001 From: rpj Date: Tue, 9 Feb 1999 14:59:13 +0000 Subject: Thu Feb 4 10:07:28 1999 Ross Johnson * global.c: Remove Pthread_exception instantiation. * cancel.c (pthread_testcancel): Change C++ exception throw. * implement.h: Remove extern declaration. --- ChangeLog | 8 ++++++++ cancel.c | 2 +- global.c | 6 ------ implement.h | 2 -- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 852baee..2815718 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,14 @@ Fri Feb 5 13:42:30 1999 Ross Johnson * semaphore.c: Comment format changes. +Thu Feb 4 10:07:28 1999 Ross Johnson + + * global.c: Remove Pthread_exception instantiation. + + * cancel.c (pthread_testcancel): Change C++ exception throw. + + * implement.h: Remove extern declaration. + Wed Feb 3 13:04:44 1999 Ross Johnson * cleanup.c: Rename _pthread_*_cleanup() to pthread_*_cleanup(). diff --git a/cancel.c b/cancel.c index 5b7ff1a..2e95b3d 100644 --- a/cancel.c +++ b/cancel.c @@ -194,7 +194,7 @@ pthread_testcancel (void) #ifdef __cplusplus - throw pthread_exception; + throw Pthread_exception(); #endif /* __cplusplus */ diff --git a/global.c b/global.c index abaea7c..a8bd69a 100644 --- a/global.c +++ b/global.c @@ -14,12 +14,6 @@ int _pthread_processInitialized = FALSE; pthread_key_t _pthread_selfThreadKey = NULL; pthread_key_t _pthread_cleanupKey = NULL; -#if !defined(_MSC_VER) && defined(__cplusplus) - -Pthread_exception pthread_exception; - -#endif - /* * Global lock for testing internal state of PTHREAD_MUTEX_INITIALIZER * created mutexes. diff --git a/implement.h b/implement.h index ca138cd..2103027 100644 --- a/implement.h +++ b/implement.h @@ -134,8 +134,6 @@ struct ThreadKeyAssoc { class Pthread_exception {}; -extern Pthread_exception pthread_exception; - #else /* __cplusplus */ #warning File __FILE__, Line __LINE__: Cancellation not supported under C. -- cgit v1.2.3