2000-07-25 Ross Johnson <rpj@special.ise.canberra.edu.au>

        * sched.c (sched_get_priority_max): Handle different WinCE and
        Win32 priority values together.
        (sched_get_priority_min): Ditto.
        - Tristan Savatier <tristan@mpegtv.com>

        * create.c (pthread_create): Force new threads to wait until
        pthread_create has the new thread's handle; we also retain
        a local copy of the handle for internal use until
        pthread_create returns.

        * private.c (_pthread_threadStart): Initialise ei[].
        (_pthread_threadStart): When beginthread is used to start the
        thread, force waiting until the creator thread had the
        thread handle.

        * cancel.c (_pthread_cancel_thread): Include context switch
        code for defined(_X86_) environments in addition to _M_IX86.

        * rwlock.c (pthread_rwlock_destroy): Assignment changed
        to avoid compiler warning.

        * private.c (_pthread_get_exception_services_code): Cast
        NULL return value to avoid compiler warning.

        * cleanup.c (pthread_pop_cleanup): Initialise "cleanup" variable
        to avoid compiler warnings.

        * misc.c (_pthread_new): Change "new" variable to "t" to avoid
        confusion with the C++ keyword of the same name.

        * condvar.c (cond_wait_cleanup): Initialise lastWaiter variable.
        (cond_timedwait): Remove unused local variables. to avoid
        compiler warnings.

        * dll.c (dllMain): Remove 2000-07-21 change - problem
        appears to be in pthread_create().

2000-07-22  Ross Johnson  <rpj@special.ise.canberra.edu.au>

        * tsd.c (pthread_key_create): If a destructor was given
        and the pthread_mutex_init failed, then would try to
        reference a NULL pointer (*key); eliminate this section of
        code by using a dynamically initialised mutex
        (PTHREAD_MUTEX_INITIALIZER).

        * tsd.c (pthread_setspecific): Return an error if
        unable to set the value; simplify cryptic conditional.

        * tsd.c (pthread_key_delete): Locking threadsLock relied
        on mutex_lock returning an error if the key has no destructor.
        ThreadsLock is only initialised if the key has a destructor.
        Making this mutex a static could reduce the number of mutexes
        used by an application since it is actually created only at
        first use and it's often destroyed soon after.

2000-07-22  Ross Johnson  <rpj@special.ise.canberra.edu.au>

        * FAQ: Added Q5 and Q6.


tests/ChangeLog:

2000-07-25  Ross Johnson  <rpj@special.ise.canberra.edu.au>

        * runtest.bat: modified to work under W98.

        * runall.bat: Add new tests; modified to work under W98.
        It was ok under NT.

        * Makefile: Add new tests.

        * exception1.c: New; Test passing exceptions back to the
        application and retaining library internal exceptions.

        * join0.c: New; Test a single join.

1 files changed, 8 insertions, 6 deletions

diff --git a/cancel.c b/cancel.c
index b687c78..c072d44 100644
--- a/cancel.c
+++ b/cancel.c
@@ -30,7 +30,7 @@
 static void 
 _pthread_cancel_self(void)
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__cplusplus)
 
   DWORD exceptionInformation[3];
 
@@ -44,7 +44,7 @@ _pthread_cancel_self(void)
 		  3,
 		  exceptionInformation);
 
-#else /* _MSC_VER */
+#else /* _MSC_VER && ! __cplusplus */
 
 # ifdef __cplusplus
 
@@ -52,7 +52,7 @@ _pthread_cancel_self(void)
 
 # endif /* __cplusplus */
 
-#endif /* _MSC_VER */
+#endif /* _MSC_VER && ! __cplusplus */
 
   /* Never reached */
 }
@@ -72,11 +72,13 @@ _pthread_cancel_thread(pthread_t thread)
 
   if (WaitForSingleObject(threadH, 0) == WAIT_TIMEOUT)
     {
+#if defined(_M_IX86) || defined(_X86_)
       CONTEXT context;
       context.ContextFlags = CONTEXT_CONTROL;
       GetThreadContext(threadH, &context);
       context.Eip = (DWORD) _pthread_cancel_self;
       SetThreadContext(threadH, &context);
+#endif
       ResumeThread(threadH);
     }
 
@@ -292,7 +294,7 @@ pthread_testcancel (void)
        * Canceling!
        */
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__cplusplus)
 
       DWORD exceptionInformation[3];
 
@@ -306,7 +308,7 @@ pthread_testcancel (void)
 		      3,
 		      exceptionInformation);
 
-#else /* _MSC_VER */
+#else /* _MSC_VER && ! __cplusplus */
 
 #ifdef __cplusplus
 
@@ -314,7 +316,7 @@ pthread_testcancel (void)
 
 #endif /* __cplusplus */
 
-#endif /* _MSC_VER */
+#endif /* _MSC_VER && ! __cplusplus */
 
     }
 }				/* pthread_testcancel */