2000-08-18 Ross Johnson <rpj@setup1.ise.canberra.edu.au>

        * Several: Fix typos from scripted edit session
        yesterday.

        * nonportable.c (pthread_mutexattr_setforcecs_np):
        Moved this function from mutex.c.
        (pthread_getw32threadhandle_np): New function to
        return the win32 thread handle that the POSIX
        thread is using.
        * mutex.c (pthread_mutexattr_setforcecs_np):
        Moved to new file "nonportable.c".

        * pthread.h (PTW32_BUILD): Only redefine __except
        and catch compiler keywords if we aren't building
        the library (ie. PTW32_BUILD is not defined) -
        this is safer than defining and then undefining
        if not building the library.
        * implement.h: Remove __except and catch undefines.
        * Makefile (CFLAGS): Define PTW32_BUILD.
        * GNUmakefile (CFLAGS): Define PTW32_BUILD.

        * All appropriate: Change Pthread_exception* to
        ptw32_exception* to be consistent with internal
        identifier naming.

        * private.c (ptw32_throw): New function to provide
        a generic exception throw for all internal
        exceptions and EH schemes.
        (ptw32_threadStart): pthread_exit() value is now
        returned via the thread structure exitStatus
        element.
        * exit.c (pthread_exit): pthread_exit() value is now
        returned via the thread structure exitStatus
        element.
        * cancel.c (ptw32_cancel_self): Now uses ptw32_throw.
        (pthread_setcancelstate): Ditto.
        (pthread_setcanceltype): Ditto.
        (pthread_testcancel): Ditto.
        (pthread_cancel): Ditto.
        * misc.c (CancelableWait): Ditto.
        * exit.c (pthread_exit): Ditto.
        * All applicable: Change PTW32_ prefix to
        PTW32_ prefix to remove leading underscores
        from private library identifiers.

1 files changed, 2 insertions, 25 deletions

diff --git a/misc.c b/misc.c
index ea38845..08de967 100644
--- a/misc.c
+++ b/misc.c
@@ -195,7 +195,7 @@ pthread_self (void)
 #endif
 	}
 
-      pthread_setspecific (ptw32_elfThreadKey, self);
+      pthread_setspecific (ptw32_selfThreadKey, self);
     }
 
   return (self);
@@ -327,30 +327,7 @@ CancelableWait (HANDLE waitHandle, DWORD timeout)
               /*
                * Thread started with pthread_create
                */
-
-#if defined(_MSC_VER) && !defined(__cplusplus)
-
-              DWORD exceptionInformation[3];
-
-              exceptionInformation[0] = (DWORD) (_PTHREAD_EPS_CANCEL);
-              exceptionInformation[1] = (DWORD) (0);
-              exceptionInformation[2] = (DWORD) (0);
-
-              RaiseException (
-                               EXCEPTION_PTHREAD_SERVICES,
-                               0,
-                               3,
-                               exceptionInformation);
-
-#else /* _MSC_VER */
-
-#ifdef __cplusplus
-
-	      throw Pthread_exception_cancel();
-
-#endif /* __cplusplus */
-
-#endif /* _MSC_VER */
+	      ptw32_throw(PTW32_EPS_CANCEL);
             }
 
          /* Should never get to here. */