With this update I'm able to build the library and build and run the

tsd1.c test successfully using buildlib.bat and build.bat scripts.
I not convinced that I understand the relationships between "__cplusplus" and
"_WIN32" and the MS compiler, particularly in pthread.h where
pthread_cleanup_push etc is defined. In particular, I have assumed that
the __try/__finally blocks are only available if _WIN32 and __cplusplus
are defined. I suspect this is wrong.
Tue Dec 29 13:11:16 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
	* implement.h: Move the following struct definitions to pthread.h:
	pthread_t_, pthread_attr_t_, pthread_mutex_t_, pthread_mutex_t_,
	pthread_mutexattr_t_, pthread_key_t_, pthread_cond_t_,
	pthread_condattr_t_, pthread_once_t_.
	* pthread.h: Add "_" prefix to pthread_push_cleanup and
	pthread_pop_cleanup internal routines, and associated struct and
	typedefs.
	* buildlib.bat: Add compile command for semaphore.c
	* pthread.def: Comment out pthread_atfork routine name.
	Now unimplemented.
	* tsd.c (pthread_setspecific): Rename tkAssocCreate to
	_pthread_tkAssocCreate.
	(pthread_key_delete): Rename tkAssocDestroy to
	_pthread_tkAssocDestroy.
	* sync.c (pthread_join): Rename threadDestroy to _pthread_threadDestroy
	* sched.c (is_attr): attr is now **attr (was *attr), so add extra
	NULL pointer test.
	(pthread_attr_setschedparam): Increase redirection for attr which is
	now a **.
	(pthread_attr_getschedparam): Ditto.
	(pthread_setschedparam): Change thread validation and rename "thread"
 	Win32 thread Handle element name to match John Bossom's version.
	(pthread_getschedparam): Ditto.
	* private.c (_pthread_threadDestroy): Rename call to
	callUserDestroyRoutines() as _pthread_callUserDestroyRoutines()
	* misc.c: Add #include "implement.h".
	* dll.c: Remove defined(KLUDGE) wrapped code.
	* fork.c: Remove redefinition of ENOMEM.
	Remove pthread_atfork() and fork() with #if 0/#endif.
	* create.c (pthread_create): Rename threadStart and threadDestroy calls
	to _pthread_threadStart and _pthread_threadDestroy.
	* implement.h: Rename "detachedstate" to "detachstate".
	* attr.c: Rename "detachedstate" to "detachstate".
Mon Dec 28 09:54:39 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
	* pthread.h (pthread_attr_t_): Change to *pthread_attr_t.
	* attr.c (pthread_attr_setstacksize): Merge with John Bossom's version.
	(pthread_attr_getstacksize): Merge with John Bossom's version.
	(pthread_attr_setstackaddr): Merge with John Bossom's version.
	(pthread_attr_getstackaddr): Merge with John Bossom's version.
	(pthread_attr_init): Merge with John Bossom's version.
	(pthread_attr_destroy): Merge with John Bossom's version.
	(pthread_attr_getdetachstate): Merge with John Bossom's version.
	(pthread_attr_setdetachstate): Merge with John Bossom's version.
	(is_attr): attr is now **attr (was *attr), so add extra NULL pointer
	test.
	* implement.h (pthread_attr_t_): Add and rename elements in JEB's
	version to correspond to original, so that it can be used with
	original attr routines.
	* pthread.h: Add #endif at end which was truncated in merging.

1 files changed, 0 insertions, 101 deletions

diff --git a/implement.h b/implement.h
index 523f475..c3be637 100644
--- a/implement.h
+++ b/implement.h
@@ -13,107 +13,6 @@
  * Code contributed by John E. Bossom <JEB>.
  */
 
-typedef enum {
-  /*
-   * This enumeration represents the state of the thread;
-   * The thread is still "alive" if the numeric value of the
-   * state is greater or equal "PThreadStateRunning".
-   */
-  PThreadStateInitial = 0,	/* Thread not running                   */
-  PThreadStateRunning,	        /* Thread alive & kicking               */
-  PThreadStateSuspended,	/* Thread alive but suspended           */
-  PThreadStateCanceling,	/* Thread alive but and is              */
-                                /* in the process of terminating        */
-                                /* due to a cancellation request        */
-  PThreadStateException,	/* Thread alive but exiting             */
-                                /* due to an exception                  */
-  PThreadStateLast
-}
-PThreadState;
-
-
-typedef enum {
-  /*
-   * This enumeration represents the reason why a thread has
-   * terminated/is terminating.
-   */
-  PThreadDemisePeaceful = 0,	/* Death due natural causes     */
-  PThreadDemiseCancelled,	/* Death due to user cancel     */
-  PThreadDemiseException,	/* Death due to unhandled       */
-                                /* exception                    */
-  PThreadDemiseNotDead	/* I'm not dead!                */
-}
-PThreadDemise;
-
-
-struct pthread_t_ {
-  DWORD thread;
-  HANDLE threadH;
-  PThreadState state;
-  PThreadDemise demise;
-  void *exitStatus;
-  void *parms;
-  int detachState;
-  int cancelState;
-  int cancelType;
-  HANDLE cancelEvent;
-  int implicit:1;
-  void *keys;
-};
-
-
-struct pthread_attr_t_ {
-  void *stackaddr;
-  size_t stacksize;
-  int detachstate;
-};
-
-
-struct pthread_key_t_ {
-  DWORD key;
-  void (*destructor) (void *);
-  pthread_mutex_t threadsLock;
-  void *threads;
-};
-
-
-struct pthread_mutexattr_t_ {
-  int pshared;
-};
-
-
-struct pthread_mutex_t_ {
-	int valid;
-	CRITICAL_SECTION cs;
-  };
-
-
-struct pthread_cond_t_ {
-  long waiters;                       /* # waiting threads             */
-  pthread_mutex_t waitersLock;        /* Mutex that guards access to 
-					 waiter count                  */
-  sem_t sema;                         /* Queue up threads waiting for the 
-					 condition to become signaled  */
-  HANDLE waitersDone;                 /* An auto reset event used by the 
-					 broadcast/signal thread to wait 
-					 for the waiting thread(s) to wake
-					 up and get a chance at the  
-					 semaphore                     */
-  int wasBroadcast;                   /* keeps track if we are signaling 
-					 or broadcasting               */
-};
-
-
-struct pthread_condattr_t_ {
-  int pshared;
-};
-
-
-struct pthread_once_t_ {
-  unsigned short flag;
-  pthread_mutex_t lock;
-};
-
 
 typedef struct ThreadParms ThreadParms;
 typedef struct ThreadKeyAssoc ThreadKeyAssoc;