2000-08-10 Ross Johnson <rpj@special.ise.canberra.edu.au>snap-2000-08-10

        * cleanup.c (pthread_pop_cleanup): Remove _pthread
        prefix from __except and catch keywords; implement.h
        now simply undefines _pthread__except and
        _pthread_catch if defined; VC++ was not textually
        substituting _pthread_catch etc back to catch as
        it was redefined; the reason for using the prefixed
        version was to make it clear that it was not using
        the pthread.h redefined catch keyword.

        * private.c (_pthread_threadStart): Ditto.
        (_pthread_callUserDestroyRoutines): Ditto.

        * implement.h (_pthread__except): Remove #define.
        (_pthread_catch): Remove #define.

        * GNUmakefile (pthread.a): New target to build
        libpthread32.a from pthread.dll using dlltool.

        * buildlib.bat: Duplicate cl commands with args to
        build C++ EH version of pthread.dll; use of .bat
        files is redundant now that nmake compatible
        Makefile is included; used as a kludge only now.

        * Makefile: Localise some macros and fix up the clean:
        target to extend it and work properly.

        * CONTRIBUTORS: Add contributors.

        * ANNOUNCE: Updated.

        * README: Updated.

tests/ChangeLog:

2000-08-10  Ross Johnson  <rpj@special.ise.canberra.edu.au>

        * eyal1.c (main): Change implicit cast to explicit
        cast when passing "print_server" function pointer;
        G++ no longer allows implicit func parameter casts.

        * cleanup1.c: Remove unused "waitLock".
        (main): Fix implicit parameter cast.

        * cancel2.c (main): Fix implicit parameter cast.

        * cancel4.c (main): Fix implicit parameter cast.

        * cancel3.c (main): Fix implicit parameter cast.

        * GNUmakefile: Renamed from Makefile; Add missing
        cancel1 and cancel2 test targets.

        * Makefile: Converted for use with MS nmake.

1 files changed, 6 insertions, 6 deletions

diff --git a/private.c b/private.c
index 03d27c3..c757fb8 100644
--- a/private.c
+++ b/private.c
@@ -223,7 +223,7 @@ _pthread_threadStart (ThreadParms * threadParms)
      */
     status = (*start) (arg);
   }
-  _pthread__except (ExceptionFilter(GetExceptionInformation(), ei))
+  __except (ExceptionFilter(GetExceptionInformation(), ei))
   {
     DWORD ec = GetExceptionCode();
 
@@ -264,21 +264,21 @@ _pthread_threadStart (ThreadParms * threadParms)
      */
     status = self->exitStatus = (*start) (arg);
   }
-  _pthread_catch (Pthread_exception_cancel)
+  catch (Pthread_exception_cancel)
     {
       /*
        * Thread was cancelled.
        */
       status = self->exitStatus = PTHREAD_CANCELED;
     }
-  _pthread_catch (Pthread_exception_exit)
+  catch (Pthread_exception_exit)
     {
       /*
        * Thread was exited via pthread_exit().
        */
       status = self->exitStatus;
     }
-  _pthread_catch (...)
+  catch (...)
     {
       /*
        * A system unexpected exception had occurred running the user's
@@ -548,7 +548,7 @@ _pthread_callUserDestroyRoutines (pthread_t thread)
 			 */
 			(*(k->destructor)) (value);
 		      }
-		      _pthread__except (EXCEPTION_EXECUTE_HANDLER)
+		      __except (EXCEPTION_EXECUTE_HANDLER)
 		      {
 			/*
 			 * A system unexpected exception had occurred
@@ -567,7 +567,7 @@ _pthread_callUserDestroyRoutines (pthread_t thread)
 			 */
 			(*(k->destructor)) (value);
 		      }
-		      _pthread_catch (...)
+		      catch (...)
 		      {
 			/*
 			 * A system unexpected exception had occurred