Merge branch 'master' of https://git.code.sf.net/p/pthreads4w/code in…

…to cmake

ChangeLog

@@ -1,3 +1,8 @@
+2019-11-03  Ross Johnson <ross dot johnson at homemail dot com dot au>
+
+	* NOTICE: Remove third party code acknowledgments because files have been
+	removed from distro.
+
 2018-08-19  Ross Johnson <ross dot johnson at homemail dot com dot au>
 
 	* context.h (__PTW32_PROCPTR): Added missing '__' prefix for v3.

NOTICE

@@ -4,26 +4,4 @@ Copyright 1999-2018, Pthreads4w contributors
 
 This product includes software developed through the colaborative
 effort of several individuals, each of whom is listed in the file
-CONTRIBUTORS included with this software.
-
-The following files are not covered under the Copyrights
-listed above:
-
-    [1] tests/rwlock7.c
-    [1] tests/rwlock7_1.c
-    [1] tests/rwlock8.c
-    [1] tests/rwlock8_1.c
-    [2] tests/threestage.c
-
-[1] The file tests/rwlock7.c and those similarly named are derived from
-code written by Dave Butenhof for his book 'Programming With POSIX(R)
-Threads'. The original code was obtained by free download from his
-website http://home.earthlink.net/~anneart/family/Threads/source.html
-
-[2] The file tests/threestage.c is taken directly from examples in the
-book "Windows System Programming, Edition 4" by Johnson (John) Hart
-Session 6, Chapter 10. ThreeStage.c
-Several required additional header and source files from the
-book examples have been included inline to simplify compilation.
-The only modification to the code has been to provide default
-values when run without arguments.
+CONTRIBUTORS included with this software.

_ptw32.h

@@ -43,10 +43,10 @@
  */
 #define  __PTW32_VERSION_MAJOR 3
 #define  __PTW32_VERSION_MINOR 0
-#define  __PTW32_VERSION_MICRO 1
+#define  __PTW32_VERSION_MICRO 2
 #define  __PTW32_VERION_BUILD 0
-#define  __PTW32_VERSION 3,0,0,1
-#define  __PTW32_VERSION_STRING "3, 0, 1, 0\0"
+#define  __PTW32_VERSION 3,0,2,0
+#define  __PTW32_VERSION_STRING "3, 0, 2, 0\0"
 
 #if defined(__GNUC__)
 # pragma GCC system_header

tests/ChangeLog

@@ -1,3 +1,11 @@
+2018-08-19  Ross Johnson <ross dot johnson at homemail dot com dot au>
+
+	* threestage.c: Delete.
+	* rwlock7.c: Delete.
+	* rwlock8.c: Delete.
+	* rwlock7_1.c: Delete.
+	* rwlock8_1.c: Delete.
+
 2018-08-10  Ross Johnson <ross dot johnson at homemail dot com dot au>
 
 	* Makefile (clean): remove *.idb files.

tests/common.mk

@@ -40,7 +40,7 @@ ALL_KNOWN_TESTS = \
 	robust1 robust2 robust3 robust4 robust5 \
 	rwlock1 rwlock2 rwlock3 rwlock4 \
 	rwlock2_t rwlock3_t rwlock4_t rwlock5_t rwlock6_t rwlock6_t2 \
-	rwlock5 rwlock6 rwlock7 rwlock7_1 rwlock8 rwlock8_1 \
+	rwlock5 rwlock6 \
 	self1 self2 \
 	semaphore1 semaphore2 semaphore3 \
 	semaphore4 semaphore4t semaphore5 \

tests/runorder.mk

@@ -113,7 +113,7 @@ once3.pass: once2.pass
 once4.pass: once3.pass
 priority1.pass: join1.pass
 priority2.pass: priority1.pass barrier3.pass
-reinit1.pass: rwlock7.pass
+reinit1.pass: rwlock6.pass
 reuse1.pass: create3.pass
 reuse2.pass: reuse1.pass
 robust1.pass: mutex8r.pass
@@ -127,13 +127,11 @@ rwlock3.pass: rwlock2.pass join2.pass
 rwlock4.pass: rwlock3.pass
 rwlock5.pass: rwlock4.pass
 rwlock6.pass: rwlock5.pass
-rwlock7.pass: rwlock6.pass
-rwlock8.pass: rwlock7.pass
 rwlock2_t.pass: rwlock2.pass
-rwlock3_t.pass: rwlock2_t.pass
-rwlock4_t.pass: rwlock3_t.pass
-rwlock5_t.pass: rwlock4_t.pass
-rwlock6_t.pass: rwlock5_t.pass
+rwlock3_t.pass: rwlock3.pass rwlock2_t.pass
+rwlock4_t.pass: rwlock4.pass rwlock3_t.pass
+rwlock5_t.pass: rwlock5.pass rwlock4_t.pass
+rwlock6_t.pass: rwlock6.pass rwlock5_t.pass
 rwlock6_t2.pass: rwlock6_t.pass
 self1.pass: sizes.pass
 self2.pass: self1.pass equal1.pass create1.pass