Wed Apr 7 09:37:00 1999 Ross Johnson <rpj@ixobrychus.canberra.edu.au>

        * *.c (comments): Remove individual attributions - these are
        documented sufficiently elsewhere.
        * implement.h (pthread.h): Remove extraneous include.

12 files changed, 47 insertions, 70 deletions

diff --git a/ANNOUNCE b/ANNOUNCE
index f481f7c..e110099 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,14 +1,16 @@
 
-                PTHREADS-WIN32 SNAPSHOT 1999-04-04
-                ----------------------------------
+                 PTHREADS-WIN32 SNAPSHOT 1999-04-06
+                 ----------------------------------
        Web Site: http://sourceware.cygnus.com/pthreads-win32/
+      FTP Site: ftp://sourceware.cygnus.com/pub/pthreads-win32
         Coordinator: Ross Johnson <rpj@ise.canberra.edu.au>
 
 
 We are pleased to announce the availability of a new snapshot of
 Pthreads-win32, an Open Source Software (OSS) implementation of the
 Threads component of the POSIX 1003.1c 1995 Standard for Microsoft's
-Win32 environment. Some functions from POSIX 1003.1b are supported.
+Win32 environment. Some functions from POSIX 1003.1b are supported
+including semaphores.
 
 Pthreads-win32 is free software, distributed under the GNU Library
 General Public License (LGPL).
@@ -228,18 +230,16 @@ points in applications and libraries:
 Availability
 ------------ 
 
-For the prebuilt DLL, export libs (for both MSVC and Mingw32), and
-pthread.h:
+The prebuilt DLL, export libs (for both MSVC and Mingw32), and the header
+files (pthread.h, semaphore.h, sched.h) are available along with the
+complete source code at:
 
-ftp://sourceware.cygnus.com/pub/pthreads-win32/pthreads-dll-1999-03-16
+	ftp://sourceware.cygnus.com/pub/pthreads-win32
+
+The pre-built DLL, export libraries and include files can be found at:
+
+	ftp://sourceware.cygnus.com/pub/pthreads-win32/dll-latest
 
-Source tree:
-      
-ftp://sourceware.cygnus.com/pub/pthreads-win32/pthreads-snap-1999-03-16.tar.gz
-      
-Source files are available in unpacked form at:
-      
-ftp://sourceware.cygnus.com/pub/pthreads-win32/sources
 
       
 Mailing List 
@@ -255,26 +255,27 @@ Application Development Environments
 ------------------------------------
       
 MSVC:
-MSVC can be used of course.
+MSVC works.
       
 Mingw32: (ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/egcs-1.1.1/)
 Mingw32 must use the thread-safe MSVCRT library. You can link
 against the export library libpthread32.a built under Mingw32
-together with the version of pthread.dll built with MSVC.
+but you must run your application with the version of pthread.dll built
+with MSVC.
       
 Cygwin: (http://sourceware.cygnus.com/cygwin/)
 Cygwin aims to provide a complete POSIX environment on top of Win32, including
 threads. When this is complete, developers using Cygwin will not need
 pthreads-win32. At this time, Cygwin has preliminary support for multithreaded
-development, however, this is not turned on by default.
+development, however, this is not turned on by default. We have not tested
+pthreads-win32 against Cygwin.
 
 Generally:
-For convenience, the following pre-built files can be downloaded from
-the FTP site:
-
-        ftp://sourceware.cygnus.com/pub/pthreads-win32/dll-latest/
+For convenience, the following pre-built files are included in the package:
 
-        pthread.h       - the standard include file
+        pthread.h       - for POSIX 1c threads
+        semaphore.h     - for POSIX 1b semaphores
+        sched.h         - for POSIX 1b scheduling
         pthread.dll     - built with MSVC cl compiler
         pthread.lib     - built with MSVC cl compiler
         libpthread32.a  - built with Mingw32 (use with MSVC pthread.dll)
diff --git a/ChangeLog b/ChangeLog
index f36a26a..f3655c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Apr  7 09:37:00 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* *.c (comments): Remove individual attributions - these are
+	documented sufficiently elsewhere.
+
+	* implement.h (pthread.h): Remove extraneous include.
+
 Sun Apr  4 11:05:57 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
 
 	* sched.c (sched.h): Include.
diff --git a/README b/README
index ca32d26..f97d324 100644
--- a/README
+++ b/README
@@ -37,7 +37,9 @@ with MSVC. Thanks to Anders Norlander for pointing this out.
 For convenience, the following pre-built files can be downloaded from
 the FTP site (see under "Availability" below):
 
-	pthread.h	- the standard include file
+	pthread.h
+	semaphore.h
+	sched.h
 	pthread.dll	- built with MSVC cl compiler
 	pthread.lib	- built with MSVC cl compiler
 	libpthread32.a	- built with Mingw32 (use with MSVC pthread.dll)
@@ -72,3 +74,4 @@ Home page:
 ----
 Ross Johnson
 <rpj@ise.canberra.edu.au>
+
diff --git a/cleanup.c b/cleanup.c
index d18afd6..c46f1e9 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -33,10 +33,6 @@
 #include "pthread.h"
 #include "implement.h"
 
-/*
- * Code contributed by John E. Bossom <JEB>.
- */
-
 _pthread_cleanup_t *
 pthread_pop_cleanup (int execute)
      /*
@@ -194,5 +190,4 @@ pthread_push_cleanup (_pthread_cleanup_t * cleanup,
 
 }                               /* _pthread_push_cleanup */
 
-/* </JEB> */
 
diff --git a/condvar.c b/condvar.c
index 714d642..a77b56a 100644
--- a/condvar.c
+++ b/condvar.c
@@ -23,10 +23,6 @@
  * MA 02111-1307, USA
  */
 
-/*
- * Code contributed by John E. Bossom <JEB>.
- */
-
 #include "pthread.h"
 #include "implement.h"
 
@@ -871,5 +867,4 @@ pthread_cond_broadcast (pthread_cond_t * cond)
 
 }
 
-/* </JEB> */
 
diff --git a/exit.c b/exit.c
index 0498dbf..46c2b3f 100644
--- a/exit.c
+++ b/exit.c
@@ -27,10 +27,6 @@
 #include "pthread.h"
 #include "implement.h"
 
-/*
- * Code contributed by John E. Bossom <JEB>.
- */
-
 void
 pthread_exit (void *value_ptr)
      /*
diff --git a/implement.h b/implement.h
index 6151ce4..a719167 100644
--- a/implement.h
+++ b/implement.h
@@ -288,8 +288,6 @@ extern CRITICAL_SECTION _pthread_mutex_test_init_lock;
 extern CRITICAL_SECTION _pthread_cond_test_init_lock;
 
 
-#include <pthread.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
diff --git a/sched.c b/sched.c
index 6d53d9b..88889de 100644
--- a/sched.c
+++ b/sched.c
@@ -25,9 +25,9 @@
 
 #define ENOSUP 0
 
-#include "sched.h"
 #include "pthread.h"
 #include "implement.h"
+#include "sched.h"
 
 static int
 is_attr(const pthread_attr_t *attr)
diff --git a/sched.h b/sched.h
index 77e91ad..2f498d3 100644
--- a/sched.h
+++ b/sched.h
@@ -25,8 +25,8 @@
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA
  */
-#if !defined( SCHED_H )
-#define SCHED_H
+#ifndef _SCHED_H
+#define _SCHED_H
 
 #ifdef _MSC_VER
 /*
@@ -70,4 +70,4 @@ int sched_get_priority_max (int policy);
 #endif                          /* __cplusplus */
 
 
-#endif                          /* !SCHED_H */
+#endif                          /* !_SCHED_H */
diff --git a/sync.c b/sync.c
index fd66065..ac4c11f 100644
--- a/sync.c
+++ b/sync.c
@@ -27,10 +27,6 @@
 #include "pthread.h"
 #include "implement.h"
 
-/*
- * Code contributed by John E. Bossom <JEB>.
- */
-
 int
 pthread_detach (pthread_t tid)
      /*
@@ -158,7 +154,3 @@ pthread_join (pthread_t thread, void **value_ptr)
 
 }				/* pthread_join */
 
-/* </JEB> */
-
-
-
diff --git a/tests/Makefile b/tests/Makefile
index 430eed2..a696bf9 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -26,10 +26,12 @@ LIBS	= ./libpthread32.a
 #INCLUDES	= -I.
 #LIBS	= pthread.lib
 
-HDR	= pthread.h
+HDR	= pthread.h semaphore.h sched.h
 LIB	= libpthread32.a
 DLL	= pthread.dll
 
+COPYFILES	= $(HDR) $(LIB) $(DLL)
+
 # If a test case returns a non-zero exit code to the shell, make will
 # stop.
 
@@ -66,27 +68,21 @@ condvar4.pass: create1.pass
 
 %.pass: %.exe $(LIB) $(DLL) $(HDR)
 	$*
-	@$(ECHO) Passed
+	@ $(ECHO) Passed
 	@ $(TOUCH) $@
 
 %.exe: %.c
 	@ $(CC) $(CFLAGS) $(INCLUDES) $(LIBS)
 
-$(LIB):
-	@ $(ECHO) Copying the library
-	@ $(CP) $(BUILD_DIR)\$@ .
-
-$(HDR):
-	@ $(ECHO) Copying the header file
-	@ $(CP) $(BUILD_DIR)\$@ .
-
-$(DLL):
-	@ $(ECHO) Copying the DLL
+$(COPYFILES):
+	@ $(ECHO) Copying $@
 	@ $(CP) $(BUILD_DIR)\$@ .
 
 clean:
 	- $(RM) *.dll
-	- $(RM) $(LIB)
-	- $(RM) $(HDR)
+	- $(RM) pthread.h
+	- $(RM) semaphore.h
+	- $(RM) sched.h
+	- $(RM) *.a
 	- $(RM) *.exe
 	- $(RM) *.pass
diff --git a/tsd.c b/tsd.c
index 3a20d7d..0766744 100644
--- a/tsd.c
+++ b/tsd.c
@@ -26,10 +26,6 @@
 #include "pthread.h"
 #include "implement.h"
 
-/*
- * Code contributed by John E. Bossom <JEB>.
- */
-
 int
 pthread_key_create (pthread_key_t * key, void (*destructor) (void *))
      /*
@@ -324,5 +320,3 @@ pthread_getspecific (pthread_key_t key)
   return (TlsGetValue (key->key));
 }
 
-/* </JEB> */
-