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

diff --git a/mutex.c b/mutex.c
index 1ea7aab..3e0e484 100644
--- a/mutex.c
+++ b/mutex.c
@@ -66,7 +66,7 @@ _mutex_check_need_init(pthread_mutex_t *mutex)
    * re-initialise it only by calling pthread_mutex_init()
    * explicitly.
    */
-  if (*mutex == (pthread_mutex_t) _PTHREAD_OBJECT_AUTO_INIT)
+  if (*mutex == (pthread_mutex_t) PTW32_OBJECT_AUTO_INIT)
     {
       result = pthread_mutex_init(mutex, NULL);
     }
@@ -140,7 +140,7 @@ pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *attr)
     }
   else
     {
-      if (ptw32_ry_enter_critical_section != NULL
+      if (ptw32_try_enter_critical_section != NULL
 	  || (attr != NULL
 	      && *attr != NULL
 	      && (*attr)->forcecs == 1)
@@ -209,7 +209,7 @@ pthread_mutex_destroy(pthread_mutex_t *mutex)
   /*
    * Check to see if we have something to delete.
    */
-  if (*mutex != (pthread_mutex_t) _PTHREAD_OBJECT_AUTO_INIT)
+  if (*mutex != (pthread_mutex_t) PTW32_OBJECT_AUTO_INIT)
     {
       mx = *mutex;
 
@@ -239,7 +239,7 @@ pthread_mutex_destroy(pthread_mutex_t *mutex)
       /*
        * Check again.
        */
-      if (*mutex == (pthread_mutex_t) _PTHREAD_OBJECT_AUTO_INIT)
+      if (*mutex == (pthread_mutex_t) PTW32_OBJECT_AUTO_INIT)
         {
           /*
            * This is all we need to do to destroy a statically
@@ -355,22 +355,6 @@ pthread_mutexattr_destroy (pthread_mutexattr_t * attr)
 
 
 int
-pthread_mutexattr_setforcecs_np(pthread_mutexattr_t *attr,
-				int forcecs)
-{
-  if (attr == NULL || *attr == NULL)
-    {
-      /* This is disallowed. */
-      return EINVAL;
-    }
-
-  (*attr)->forcecs = forcecs;
-
-  return 0;
-}
-
-
-int
 pthread_mutexattr_getpshared (const pthread_mutexattr_t * attr,
 			      int *pshared)
      /*
@@ -528,7 +512,7 @@ pthread_mutex_lock(pthread_mutex_t *mutex)
    * again inside the guarded section of _mutex_check_need_init()
    * to avoid race conditions.
    */
-  if (*mutex == (pthread_mutex_t) _PTHREAD_OBJECT_AUTO_INIT)
+  if (*mutex == (pthread_mutex_t) PTW32_OBJECT_AUTO_INIT)
     {
       result = _mutex_check_need_init(mutex);
     }
@@ -571,7 +555,7 @@ pthread_mutex_unlock(pthread_mutex_t *mutex)
    * race condition. If another thread holds the
    * lock then we shouldn't be in here.
    */
-  if (mx != (pthread_mutex_t) _PTHREAD_OBJECT_AUTO_INIT)
+  if (mx != (pthread_mutex_t) PTW32_OBJECT_AUTO_INIT)
     {
       if (mx->mutex == 0)
 	{
@@ -607,7 +591,7 @@ pthread_mutex_trylock(pthread_mutex_t *mutex)
    * again inside the guarded section of _mutex_check_need_init()
    * to avoid race conditions.
    */
-  if (*mutex == (pthread_mutex_t) _PTHREAD_OBJECT_AUTO_INIT)
+  if (*mutex == (pthread_mutex_t) PTW32_OBJECT_AUTO_INIT)
     {
       result = _mutex_check_need_init(mutex);
     }