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, 9 insertions, 9 deletions

diff --git a/rwlock.c b/rwlock.c
index f476b8a..d02461c 100644
--- a/rwlock.c
+++ b/rwlock.c
@@ -64,7 +64,7 @@ _rwlock_check_need_init(pthread_rwlock_t *rwlock)
    * re-initialise it only by calling pthread_rwlock_init()
    * explicitly.
    */
-  if (*rwlock == (pthread_rwlock_t) _PTHREAD_OBJECT_AUTO_INIT)
+  if (*rwlock == (pthread_rwlock_t) PTW32_OBJECT_AUTO_INIT)
     {
       result = pthread_rwlock_init(rwlock, NULL);
     }
@@ -158,7 +158,7 @@ pthread_rwlock_destroy(pthread_rwlock_t *rwlock)
         return(EINVAL);
       }
 
-    if (*rwlock != (pthread_rwlock_t) _PTHREAD_OBJECT_AUTO_INIT)
+    if (*rwlock != (pthread_rwlock_t) PTW32_OBJECT_AUTO_INIT)
       {
         rw = *rwlock;
 
@@ -197,12 +197,12 @@ pthread_rwlock_destroy(pthread_rwlock_t *rwlock)
         /*
          * See notes in _rwlock_check_need_init() above also.
          */
-        EnterCriticalSection(&ptw32_wlock_test_init_lock);
+        EnterCriticalSection(&ptw32_rwlock_test_init_lock);
 
         /*
          * Check again.
          */
-        if (*rwlock == (pthread_rwlock_t) _PTHREAD_OBJECT_AUTO_INIT)
+        if (*rwlock == (pthread_rwlock_t) PTW32_OBJECT_AUTO_INIT)
           {
             /*
              * This is all we need to do to destroy a statically
@@ -254,7 +254,7 @@ pthread_rwlock_rdlock(pthread_rwlock_t *rwlock)
      * again inside the guarded section of _rwlock_check_need_init()
      * to avoid race conditions.
      */
-    if (*rwlock == (pthread_rwlock_t) _PTHREAD_OBJECT_AUTO_INIT)
+    if (*rwlock == (pthread_rwlock_t) PTW32_OBJECT_AUTO_INIT)
       {
         result = _rwlock_check_need_init(rwlock);
 
@@ -332,7 +332,7 @@ pthread_rwlock_wrlock(pthread_rwlock_t * rwlock)
      * again inside the guarded section of _rwlock_check_need_init()
      * to avoid race conditions.
      */
-    if (*rwlock == (pthread_rwlock_t) _PTHREAD_OBJECT_AUTO_INIT)
+    if (*rwlock == (pthread_rwlock_t) PTW32_OBJECT_AUTO_INIT)
       {
         result = _rwlock_check_need_init(rwlock);
 
@@ -389,7 +389,7 @@ pthread_rwlock_unlock(pthread_rwlock_t * rwlock)
         return(EINVAL);
       }
 
-    if (*rwlock == (pthread_rwlock_t) _PTHREAD_OBJECT_AUTO_INIT)
+    if (*rwlock == (pthread_rwlock_t) PTW32_OBJECT_AUTO_INIT)
       {
         /*
          * Assume any race condition here is harmless.
@@ -463,7 +463,7 @@ pthread_rwlock_tryrdlock(pthread_rwlock_t * rwlock)
      * again inside the guarded section of _rwlock_check_need_init()
      * to avoid race conditions.
      */
-    if (*rwlock == (pthread_rwlock_t) _PTHREAD_OBJECT_AUTO_INIT)
+    if (*rwlock == (pthread_rwlock_t) PTW32_OBJECT_AUTO_INIT)
       {
         result = _rwlock_check_need_init(rwlock);
 
@@ -518,7 +518,7 @@ pthread_rwlock_trywrlock(pthread_rwlock_t * rwlock)
      * again inside the guarded section of _rwlock_check_need_init()
      * to avoid race conditions.
      */
-    if (*rwlock == (pthread_rwlock_t) _PTHREAD_OBJECT_AUTO_INIT)
+    if (*rwlock == (pthread_rwlock_t) PTW32_OBJECT_AUTO_INIT)
       {
         result = _rwlock_check_need_init(rwlock);