diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | private.c | 10 | ||||
| -rw-r--r-- | pthread.h | 2 | ||||
| -rw-r--r-- | tsd.c | 2 |
4 files changed, 19 insertions, 6 deletions
@@ -1,4 +1,13 @@ -2000-08-18 Ross Johnson <rpj@special.ise.canberra.edu.au> +2000-08-22 Ross Johnson <rpj@setup1.ise.canberra.edu.au> + + * private.c (ptw32_throw): Fix exception test; + move exceptionInformation declaration. + + * tsd.c (pthread_key_create): newkey wrongly declared. + + * pthread.h: Fix comment block. + +2000-08-18 Ross Johnson <rpj@setup1.ise.canberra.edu.au> * mutex.c (pthread_mutex_destroy): Check that the mutex isn't held; invalidate the mutex as early as possible to avoid @@ -824,7 +824,13 @@ ptw32_get_exception_services_code(void) void ptw32_throw(DWORD exception) { - if (exception != PTW32_EPS_CANCEL || +#if defined(_MSC_VER) && !defined(__cplusplus) + + DWORD exceptionInformation[3]; + +#endif + + if (exception != PTW32_EPS_CANCEL && exception != PTW32_EPS_EXIT) { /* Should never enter here */ @@ -833,8 +839,6 @@ ptw32_throw(DWORD exception) #if defined(_MSC_VER) && !defined(__cplusplus) - DWORD exceptionInformation[3]; - exceptionInformation[0] = (DWORD) (exception); exceptionInformation[1] = (DWORD) (0); exceptionInformation[2] = (DWORD) (0); @@ -984,7 +984,7 @@ class ptw32_exception_exit : public ptw32_exception {}; #ifndef PTW32_BUILD /* FIXME: This is only required if the library was built using SEH */ - * +/* * Get internal SEH tag */ DWORD ptw32_get_exception_services_code(void); @@ -64,7 +64,7 @@ pthread_key_create (pthread_key_t * key, void (*destructor) (void *)) */ { int result = 0; - pthread_key_t *newkey; + pthread_key_t newkey; if ((newkey = (pthread_key_t) calloc (1, sizeof (*newkey))) == NULL) { |