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, 78 insertions, 32 deletions

diff --git a/ChangeLog b/ChangeLog
index 22393ab..433a835 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,49 @@
+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.
+
 2000-08-17  Ross Johnson  <rpj@special.ise.canberra.edu.au>
 
 	* All applicable: Change _pthread_ prefix to
@@ -116,7 +162,7 @@
 
 2000-08-03  Ross Johnson  <rpj@special.ise.canberra.edu.au>
 
-	* pthread.h: Add a base class Pthread_exception for
+	* pthread.h: Add a base class ptw32_exception for
 	library internal exceptions and change the "catch"
 	re-define macro to use it.
 
@@ -254,13 +300,13 @@
 2000-01-04  Ross Johnson  <rpj@special.ise.canberra.edu.au>
 
 	* private.c (ptw32_get_exception_services_code): New; returns
-	value of EXCEPTION_PTHREAD_SERVICES.
+	value of EXCEPTION_PTW32_SERVICES.
 	(ptw32_processInitialize): Remove initialisation of
 	ptw32_exception_services which is no longer needed.
 
 	* pthread.h (ptw32_exception_services): Remove extern.
 	(ptw32_get_exception_services_code): Add function prototype;
-	use this to return EXCEPTION_PTHREAD_SERVICES value instead of
+	use this to return EXCEPTION_PTW32_SERVICES value instead of
 	using the ptw32_exception_services variable which I had
 	trouble exporting through pthread.def.
 
@@ -524,15 +570,15 @@ Tue Aug 17 20:00:08 1999  Mumit Khan  <khan@xraylith.wisc.edu>
 	(general): Define and rename exceptions.
 
 
-	* misc.c (CancelableWait):  _PTHREAD_EPS_CANCEL (SEH) and
-	Pthread_exception_cancel (C++) used to identify the exception.
+	* misc.c (CancelableWait):  PTW32_EPS_CANCEL (SEH) and
+	ptw32_exception_cancel (C++) used to identify the exception.
 
-	* cancel.c (pthread_testcancel): _PTHREAD_EPS_CANCEL (SEH) and
-	Pthread_exception_cancel (C++) used to identify the exception.
+	* cancel.c (pthread_testcancel): PTW32_EPS_CANCEL (SEH) and
+	ptw32_exception_cancel (C++) used to identify the exception.
 
 	* exit.c (pthread_exit): throw/raise an exception to return to
-	ptw32_threadStart() to exit the thread. _PTHREAD_EPS_EXIT (SEH)
-	and Pthread_exception_exit (C++) used to identify the exception.
+	ptw32_threadStart() to exit the thread. PTW32_EPS_EXIT (SEH)
+	and ptw32_exception_exit (C++) used to identify the exception.
 
 	* private.c (ptw32_threadStart): Add pthread_exit exception trap;
 	clean up and exit the thread directly rather than via pthread_exit().
@@ -822,7 +868,7 @@ Fri Feb  5 13:42:30 1999  Ross Johnson  <rpj@swan.canberra.edu.au>
 
 Thu Feb  4 10:07:28 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
 
-	* global.c: Remove Pthread_exception instantiation.
+	* global.c: Remove ptw32_exception instantiation.
 
 	* cancel.c (pthread_testcancel): Change C++ exception throw.
 
@@ -858,7 +904,7 @@ Tue Feb  2 18:07:43 1999  Ross Johnson  <rpj@swan.canberra.edu.au>
 	Reverse LHS/RHS bitwise assignments.
 
 	* pthread.h: Remove #include <semaphore.h>.
-	(_PTHREAD_ATTR_VALID): Add cast.
+	(PTW32_ATTR_VALID): Add cast.
 	(struct pthread_t_): Add sigmask element.
 
 	* dll.c: Add "extern C" for DLLMain.
@@ -950,7 +996,7 @@ Fri Jan 22 14:31:59 1999  Ross Johnson  <rpj@swan.canberra.edu.au>
 
 	* cancel.c (pthread_testcancel): Ditto.
 
-	* implement.h (class pthread_exception): Define for C++.
+	* implement.h (class ptw32_exception): Define for C++.
 
 	* pthread.h: Fix C, C++, and Win32 SEH condition compilation
 	mayhem around pthread_cleanup_* defines. C++ version now uses John
@@ -1400,7 +1446,7 @@ Sat Oct 24 18:34:59 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
 
 Fri Oct 23 00:08:09 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
 
-	* implement.h (_PTHREAD_TSD_KEY_REUSE): Add enum.
+	* implement.h (PTW32_TSD_KEY_REUSE): Add enum.
 
 	* private.c (ptw32_delete_thread): Add call to
 	ptw32_destructor_run_all() to clean up the threads keys.
@@ -1486,8 +1532,8 @@ Mon Oct 12 00:00:44 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
 	* implement.h (ptw32_destructor_push): Remove.
 	(ptw32_destructor_pop): Remove.
 	(ptw32_destructor_run_all): Rename from ptw32_destructor_pop_all.
-	(_PTHREAD_TSD_KEY_DELETED): Add enum.
-	(_PTHREAD_TSD_KEY_INUSE): Add enum.
+	(PTW32_TSD_KEY_DELETED): Add enum.
+	(PTW32_TSD_KEY_INUSE): Add enum.
 
 	* cleanup.c (ptw32_destructor_push): Remove.
 	(ptw32_destructor_pop): Remove.
@@ -1693,7 +1739,7 @@ Thu Aug  6 15:19:22 1998  Ross Johnson  <rpj@swan.canberra.edu.au>
 	* private.c (ptw32_new_thread): Typecast (HANDLE) NULL.
 	(ptw32_delete_thread): Ditto.
 
-	* implement.h: (_PTHREAD_MAX_THREADS): Add define. This keeps
+	* implement.h: (PTW32_MAX_THREADS): Add define. This keeps
 	changing in an attempt to make thread administration data types
 	opaque and cleanup DLL startup.
 
@@ -1704,7 +1750,7 @@ Thu Aug  6 15:19:22 1998  Ross Johnson  <rpj@swan.canberra.edu.au>
 	(ptw32_threads_mutex_table): Ditto.
 
 	* global.c (_POSIX_THREAD_THREADS_MAX): Initialise with 
-	_PTHREAD_MAX_THREADS.
+	PTW32_MAX_THREADS.
 	(ptw32_virgins): Ditto.
 	(ptw32_reuse): Ditto.
 	(ptw32_win32handle_map): Ditto.
@@ -1839,9 +1885,9 @@ Mon Aug  3 21:19:57 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
 	member initialisation - cancelstate, canceltype, cancel_pending.
 	(is_attr): Make arg "attr" a const.
 
-	* implement.h (_PTHREAD_HANDLER_POP_LIFO): Remove definition.
-	(_PTHREAD_HANDLER_POP_FIFO): Ditto.
-	(_PTHREAD_VALID): Add missing newline escape (\).
+	* implement.h (PTW32_HANDLER_POP_LIFO): Remove definition.
+	(PTW32_HANDLER_POP_FIFO): Ditto.
+	(PTW32_VALID): Add missing newline escape (\).
 	(ptw32_handler_node): Make element "next" a pointer.
 
 1998-08-02  Ben Elliston  <bje@cygnus.com>
@@ -1903,8 +1949,8 @@ Fri Jul 31 00:05:45 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
 
 	* condvar.c (windows.h): Add include.
 
-	* implement.h (_PTHREAD_THIS): Remove - no longer required.
-	(_PTHREAD_STACK): Use pthread_self() instead of _PTHREAD_THIS.
+	* implement.h (PTW32_THIS): Remove - no longer required.
+	(PTW32_STACK): Use pthread_self() instead of PTW32_THIS.
 
 Thu Jul 30 23:12:45 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
 
@@ -1921,7 +1967,7 @@ Thu Jul 30 23:12:45 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
 	local storage.
 
 	* implement.h: Add ptw32_threadID_TlsIndex.
-	Add ()s around _PTHREAD_VALID expression.
+	Add ()s around PTW32_VALID expression.
 
 	* misc.c (pthread_self): Re-implement using Win32 TLS to store
 	the threads own ID.
@@ -1940,7 +1986,7 @@ Wed Jul 29 11:39:03 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
 
 Tue Jul 28 14:04:29 1998  Ross Johnson  <rpj@swan.canberra.edu.au>
 
-	* implement.h: Add _PTHREAD_VALID macro.
+	* implement.h: Add PTW32_VALID macro.
 
 	* sync.c (pthread_join): Modify to use the new thread
 	type and ptw32_delete_thread(). Rename "target" to "thread".
@@ -1956,14 +2002,14 @@ Tue Jul 28 14:04:29 1998  Ross Johnson  <rpj@swan.canberra.edu.au>
 
 	* private.c (ptw32_find_thread): Fix return type and arg.
 
-	* implement.h: Remove _PTHREAD_YES and _PTHREAD_NO.
+	* implement.h: Remove PTW32_YES and PTW32_NO.
 	(ptw32_new_thread): Add prototype.
 	(ptw32_find_thread): Ditto.
 	(ptw32_delete_thread): Ditto.
 	(ptw32_new_thread_entry): Remove prototype.
 	(ptw32_find_thread_entry): Ditto.
 	(ptw32_delete_thread_entry): Ditto.
-	(  _PTHREAD_NEW, _PTHREAD_INUSE, _PTHREAD_EXITED, _PTHREAD_REUSE):
+	(  PTW32_NEW, PTW32_INUSE, PTW32_EXITED, PTW32_REUSE):
 	Add.
 
 
@@ -2146,7 +2192,7 @@ Sat Jul 25 00:00:13 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
 
 	* exit.c (pthread_exit): Fix indirection mistake.
 
-	* implement.h (_PTHREAD_THREADS_TABLE_INDEX): Add.
+	* implement.h (PTW32_THREADS_TABLE_INDEX): Add.
 
 	* exit.c (ptw32_vacuum): Fix incorrect args to
 	ptw32_handler_pop_all() calls.
@@ -2154,7 +2200,7 @@ Sat Jul 25 00:00:13 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
 
 	* sync.c (pthread_join): Add multiple join and async detach handling.
 
-	* implement.h (_PTHREAD_THREADS_TABLE_INDEX): Add.
+	* implement.h (PTW32_THREADS_TABLE_INDEX): Add.
 
 	* global.c (ptw32_threads_mutex_table): Add.
 
@@ -2192,8 +2238,8 @@ Fri Jul 24 21:13:55 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
 	* exit.c (pthread_exit): Add comment explaining the longjmp().
 
 	* implement.h (ptw32_threads_thread_t): New member cancelthread.
-	(_PTHREAD_YES): Define.
-	(_PTHREAD_NO): Define.
+	(PTW32_YES): Define.
+	(PTW32_NO): Define.
 	(RND_SIZEOF): Remove.
 
 	* create.c (pthread_create): Rename cancelability to cancelstate.
@@ -2309,7 +2355,7 @@ Fri Jul 24 00:21:21 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
 	(pthread_attr_getdetachstate): Implement.
 	(pthread_attr_setdetachstate): Likewise.
 
-	* implement.h (_PTHREAD_CANCEL_DEFAULTS): Remove.  Bit fields
+	* implement.h (PTW32_CANCEL_DEFAULTS): Remove.  Bit fields
 	proved to be too cumbersome.  Set the defaults in attr.c using the
 	public PTHREAD_CANCEL_* constants.
 
@@ -2495,7 +2541,7 @@ Mon Jul 20 02:31:05 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
 	non-sharable static data within the pthread DLL.
 
 	* implement.h: Add ptw32_cleanup_stack_t, ptw32_cleanup_node_t
-	and _PTHREAD_HASH_INDEX.
+	and PTW32_HASH_INDEX.
 
 	* exit.c (pthread_exit): Begin work on cleanup and de-allocate
 	thread-private storage.