2000-09-02 Ross Johnson <rpj@special.ise.canberra.edu.au>

	* rwlock.c (_rwlock_check*): Renamed to
	ptw32_rwlock_check*.
	* mutex.c (_mutex_check*): Renamed to ptw32_mutex_check*.
	* condvar.c (cond_timed*): Renamed to ptw32_cond_timed*.
	(_cond_check*): Renamed to ptw32_cond_check*.

4 files changed, 32 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index 447bc68..d672b3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-09-02  Ross Johnson  <rpj@special.ise.canberra.edu.au>
+
+	* rwlock.c (_rwlock_check*): Renamed to
+	ptw32_rwlock_check*.
+	* mutex.c (_mutex_check*): Renamed to ptw32_mutex_check*.
+	* condvar.c (cond_timed*): Renamed to ptw32_cond_timed*.
+	(_cond_check*): Renamed to ptw32_cond_check*.
+
 2000-08-22  Ross Johnson  <rpj@setup1.ise.canberra.edu.au>
 
 	* private.c (ptw32_throw): Fix exception test;
diff --git a/condvar.c b/condvar.c
index 87e62d8..3c5999f 100644
--- a/condvar.c
+++ b/condvar.c
@@ -27,7 +27,7 @@
 #include "implement.h"
 
 static int
-_cond_check_need_init(pthread_cond_t *cond)
+ptw32_cond_check_need_init(pthread_cond_t *cond)
 {
   int result = 0;
 
@@ -490,7 +490,7 @@ pthread_cond_destroy (pthread_cond_t * cond)
   else
     {
       /*
-       * See notes in _cond_check_need_init() above also.
+       * See notes in ptw32_cond_check_need_init() above also.
        */
       EnterCriticalSection(&ptw32_cond_test_init_lock);
 
@@ -585,7 +585,7 @@ cond_wait_cleanup(void * args)
 }
 
 static int
-cond_timedwait (pthread_cond_t * cond, 
+ptw32_cond_timedwait (pthread_cond_t * cond, 
 		pthread_mutex_t * mutex,
 		const struct timespec *abstime)
 {
@@ -601,12 +601,12 @@ cond_timedwait (pthread_cond_t * cond,
   /*
    * We do a quick check to see if we need to do more work
    * to initialise a static condition variable. We check
-   * again inside the guarded section of _cond_check_need_init()
+   * again inside the guarded section of ptw32_cond_check_need_init()
    * to avoid race conditions.
    */
   if (*cond == (pthread_cond_t) PTW32_OBJECT_AUTO_INIT)
     {
-      result = _cond_check_need_init(cond);
+      result = ptw32_cond_check_need_init(cond);
     }
 
   if (result != 0 && result != EBUSY)
@@ -677,7 +677,7 @@ cond_timedwait (pthread_cond_t * cond,
    */
   return (result);
 
-}                               /* cond_timedwait */
+}                               /* ptw32_cond_timedwait */
 
 
 int
@@ -731,7 +731,7 @@ pthread_cond_wait (pthread_cond_t * cond,
       */
 {
   /* The NULL abstime arg means INFINITE waiting. */
-  return(cond_timedwait(cond, mutex, NULL));
+  return(ptw32_cond_timedwait(cond, mutex, NULL));
 }                               /* pthread_cond_wait */
 
 
@@ -792,7 +792,7 @@ pthread_cond_timedwait (pthread_cond_t * cond,
     }
   else
     {
-      result = cond_timedwait(cond, mutex, abstime);
+      result = ptw32_cond_timedwait(cond, mutex, abstime);
     }
 
   return(result);
diff --git a/mutex.c b/mutex.c
index 42c0844..8da2891 100644
--- a/mutex.c
+++ b/mutex.c
@@ -31,7 +31,7 @@
 
 
 static int
-_mutex_check_need_init(pthread_mutex_t *mutex)
+ptw32_mutex_check_need_init(pthread_mutex_t *mutex)
 {
   int result = 0;
 
@@ -250,7 +250,7 @@ pthread_mutex_destroy(pthread_mutex_t *mutex)
   else
     {
       /*
-       * See notes in _mutex_check_need_init() above also.
+       * See notes in ptw32_mutex_check_need_init() above also.
        */
       EnterCriticalSection(&ptw32_mutex_test_init_lock);
 
@@ -530,12 +530,12 @@ pthread_mutex_lock(pthread_mutex_t *mutex)
   /*
    * We do a quick check to see if we need to do more work
    * to initialise a static mutex. We check
-   * again inside the guarded section of _mutex_check_need_init()
+   * again inside the guarded section of ptw32_mutex_check_need_init()
    * to avoid race conditions.
    */
   if (*mutex == (pthread_mutex_t) PTW32_OBJECT_AUTO_INIT)
     {
-      result = _mutex_check_need_init(mutex);
+      result = ptw32_mutex_check_need_init(mutex);
     }
 
   mx = *mutex;
@@ -609,12 +609,12 @@ pthread_mutex_trylock(pthread_mutex_t *mutex)
   /*
    * We do a quick check to see if we need to do more work
    * to initialise a static mutex. We check
-   * again inside the guarded section of _mutex_check_need_init()
+   * again inside the guarded section of ptw32_mutex_check_need_init()
    * to avoid race conditions.
    */
   if (*mutex == (pthread_mutex_t) PTW32_OBJECT_AUTO_INIT)
     {
-      result = _mutex_check_need_init(mutex);
+      result = ptw32_mutex_check_need_init(mutex);
     }
 
   mx = *mutex;
diff --git a/rwlock.c b/rwlock.c
index 4353847..302d77b 100644
--- a/rwlock.c
+++ b/rwlock.c
@@ -29,7 +29,7 @@
 #include "implement.h"
 
 static int
-_rwlock_check_need_init(pthread_rwlock_t *rwlock)
+ptw32_rwlock_check_need_init(pthread_rwlock_t *rwlock)
 {
   int result = 0;
 
@@ -198,7 +198,7 @@ pthread_rwlock_destroy(pthread_rwlock_t *rwlock)
     else
       {
         /*
-         * See notes in _rwlock_check_need_init() above also.
+         * See notes in ptw32_rwlock_check_need_init() above also.
          */
         EnterCriticalSection(&ptw32_rwlock_test_init_lock);
 
@@ -254,12 +254,12 @@ pthread_rwlock_rdlock(pthread_rwlock_t *rwlock)
     /*
      * We do a quick check to see if we need to do more work
      * to initialise a static rwlock. We check
-     * again inside the guarded section of _rwlock_check_need_init()
+     * again inside the guarded section of ptw32_rwlock_check_need_init()
      * to avoid race conditions.
      */
     if (*rwlock == (pthread_rwlock_t) PTW32_OBJECT_AUTO_INIT)
       {
-        result = _rwlock_check_need_init(rwlock);
+        result = ptw32_rwlock_check_need_init(rwlock);
 
         if (result != 0 && result != EBUSY)
           {
@@ -332,12 +332,12 @@ pthread_rwlock_wrlock(pthread_rwlock_t * rwlock)
     /*
      * We do a quick check to see if we need to do more work
      * to initialise a static rwlock. We check
-     * again inside the guarded section of _rwlock_check_need_init()
+     * again inside the guarded section of ptw32_rwlock_check_need_init()
      * to avoid race conditions.
      */
     if (*rwlock == (pthread_rwlock_t) PTW32_OBJECT_AUTO_INIT)
       {
-        result = _rwlock_check_need_init(rwlock);
+        result = ptw32_rwlock_check_need_init(rwlock);
 
         if (result != 0 && result != EBUSY)
           {
@@ -463,12 +463,12 @@ pthread_rwlock_tryrdlock(pthread_rwlock_t * rwlock)
     /*
      * We do a quick check to see if we need to do more work
      * to initialise a static rwlock. We check
-     * again inside the guarded section of _rwlock_check_need_init()
+     * again inside the guarded section of ptw32_rwlock_check_need_init()
      * to avoid race conditions.
      */
     if (*rwlock == (pthread_rwlock_t) PTW32_OBJECT_AUTO_INIT)
       {
-        result = _rwlock_check_need_init(rwlock);
+        result = ptw32_rwlock_check_need_init(rwlock);
 
         if (result != 0 && result != EBUSY)
           {
@@ -518,12 +518,12 @@ pthread_rwlock_trywrlock(pthread_rwlock_t * rwlock)
     /*
      * We do a quick check to see if we need to do more work
      * to initialise a static rwlock. We check
-     * again inside the guarded section of _rwlock_check_need_init()
+     * again inside the guarded section of ptw32_rwlock_check_need_init()
      * to avoid race conditions.
      */
     if (*rwlock == (pthread_rwlock_t) PTW32_OBJECT_AUTO_INIT)
       {
-        result = _rwlock_check_need_init(rwlock);
+        result = ptw32_rwlock_check_need_init(rwlock);
 
         if (result != 0 && result != EBUSY)
           {