summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclPort.h5
-rw-r--r--unix/tclUnixPort.h6
-rw-r--r--win/tcl.m48
4 files changed, 17 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 54ba830..96e1078 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-15 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * generic/tclPort.h: [Bug 3598300]: unix: tcl.h does not include
+ * unix/tclUnixPort.h: sys/stat.h
+
2013-01-14 Jan Nijtmans <nijtmans@users.sf.net>
* win/tcl.m4: More flexible search for win32 tclConfig.sh,
diff --git a/generic/tclPort.h b/generic/tclPort.h
index 7021b8d..12a60db 100644
--- a/generic/tclPort.h
+++ b/generic/tclPort.h
@@ -19,11 +19,10 @@
#endif
#if defined(_WIN32)
# include "tclWinPort.h"
-#endif
-#include "tcl.h"
-#if !defined(_WIN32)
+#else
# include "tclUnixPort.h"
#endif
+#include "tcl.h"
#if !defined(LLONG_MIN)
# ifdef TCL_WIDE_INT_IS_LONG
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index 0aa765a..32d14e1 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -283,7 +283,7 @@ MODULE_SCOPE int TclUnixSetBlockingMode(int fd, int mode);
#endif
#ifdef GETTOD_NOT_DECLARED
-EXTERN int gettimeofday (struct timeval *tp,
+extern int gettimeofday (struct timeval *tp,
struct timezone *tzp);
#endif
@@ -627,8 +627,6 @@ typedef int socklen_t;
#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)
* #define gmtime(x) TclpGmtime(x) */
# undef inet_ntoa
@@ -646,7 +644,7 @@ EXTERN struct tm *TclpGmtime(CONST time_t *);
# ifdef HAVE_PTHREAD_GETATTR_NP
# define TclpPthreadGetAttrs pthread_getattr_np
# ifdef GETATTRNP_NOT_DECLARED
-EXTERN int pthread_getattr_np (pthread_t, pthread_attr_t *);
+extern int pthread_getattr_np (pthread_t, pthread_attr_t *);
# endif
# endif /* HAVE_PTHREAD_GETATTR_NP */
# endif /* HAVE_PTHREAD_ATTR_GET_NP */
diff --git a/win/tcl.m4 b/win/tcl.m4
index 7559591..b425a02 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -77,6 +77,10 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
for i in `ls -d ${libdir} 2>/dev/null` \
`ls -d ${exec_prefix}/lib 2>/dev/null` \
`ls -d ${prefix}/lib 2>/dev/null` \
+ `ls -d /cygdrive/c/Tcl/lib 2>/dev/null` \
+ `ls -d /cygdrive/c/Progra~1/Tcl/lib 2>/dev/null` \
+ `ls -d /c/Tcl/lib 2>/dev/null` \
+ `ls -d /c/Progra~1/Tcl/lib 2>/dev/null` \
`ls -d C:/Tcl/lib 2>/dev/null` \
`ls -d C:/Progra~1/Tcl/lib 2>/dev/null` \
; do
@@ -191,6 +195,10 @@ AC_DEFUN([SC_PATH_TKCONFIG], [
for i in `ls -d ${libdir} 2>/dev/null` \
`ls -d ${exec_prefix}/lib 2>/dev/null` \
`ls -d ${prefix}/lib 2>/dev/null` \
+ `ls -d /cygdrive/c/Tcl/lib 2>/dev/null` \
+ `ls -d /cygdrive/c/Progra~1/Tcl/lib 2>/dev/null` \
+ `ls -d /c/Tcl/lib 2>/dev/null` \
+ `ls -d /c/Progra~1/Tcl/lib 2>/dev/null` \
`ls -d C:/Tcl/lib 2>/dev/null` \
`ls -d C:/Progra~1/Tcl/lib 2>/dev/null` \
; do