summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--unix/tclUnixPort.h2
-rw-r--r--unix/tclUnixThrd.c2
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1fee643..fc826e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-08 Don Porter <dgp@users.sourceforge.net>
+
+ * unix/tclUnixPort.h: [Bug 3530533] Centralize #include <pthread.h>
+ * unix/tclUnixThrd.c: in the tclUnixPort.h header so that old unix
+ systems that need inclusion in all compilation units are supported.
+
2012-06-06 Jan Nijtmans <nijtmans@users.sf.net>
* unix/tclUnixInit.c: On Cygwin, use win32 API in stead of uname()
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index 8684757..6ff13eb 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -626,6 +626,7 @@ typedef int socklen_t;
#define TclpExit exit
#ifdef TCL_THREADS
+# include <pthread.h>
EXTERN struct tm *TclpLocaltime(CONST time_t *);
EXTERN struct tm *TclpGmtime(CONST time_t *);
/* #define localtime(x) TclpLocaltime(x)
@@ -639,7 +640,6 @@ EXTERN struct tm *TclpGmtime(CONST time_t *);
* Assume it is in pthread_np.h if it isn't in pthread.h. [Bug 1064882]
* We might need to revisit this in the future. :^(
*/
-# include <pthread.h>
# include <pthread_np.h>
# endif
# else
diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c
index fd2cd8f..ad36242 100644
--- a/unix/tclUnixThrd.c
+++ b/unix/tclUnixThrd.c
@@ -14,8 +14,6 @@
#ifdef TCL_THREADS
-#include "pthread.h"
-
typedef struct ThreadSpecificData {
char nabuf[16];
} ThreadSpecificData;