2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c0dc818..9c4b413 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-10-21  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* pthread.h (_POSIX_THREADS): Only define it if it isn't
+	already defined. Projects may need to define this on
+	the CC command line under Win32 as it doesn't have unistd.h
+	- Aurelio Medina <aureliom@crt.com>
+
 1999-10-17  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
 
 	* rwlock.c (pthread_rwlock_destroy): Add cast to remove compile
diff --git a/pthread.h b/pthread.h
index ebf9854..87f769e 100644
--- a/pthread.h
+++ b/pthread.h
@@ -376,7 +376,9 @@ extern "C"
 /*
  * POSIX Options
  */
+#ifndef _POSIX_THREADS
 #define _POSIX_THREADS
+#endif
 #define _POSIX_THREAD_SAFE_FUNCTIONS
 
 #define _POSIX_THREAD_ATTR_STACKSIZE
@@ -923,8 +925,8 @@ int * _errno( void );
 	  (_buf) )
 
 #define ctime_r( _clock, _buf ) \
-	( strcpy( (_buf), ctime( (_tm) ) ), \
-	  (_buf) )
+	( strcpy( (_buf), ctime( (_tm) ) ),  \
+          (_buf) )
 
 #define gmtime_r( _clock, _result ) \
 	( *(_result) = *gmtime( (_clock) ), \