diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-15 17:32:13 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-15 17:32:13 (GMT) |
| commit | 2a95f6b4192876906ced706fcdf40926f6a7eab7 (patch) | |
| tree | bde14dee2ae7e6ac207fdcf9e4a51eb50b462211 | |
| parent | a232873402bb9f847fdff9033a824fb7f62dd4b1 (diff) | |
| parent | ea654cca69bc5e2bc539a27b0d7322f20466134f (diff) | |
| download | tcl-2a95f6b4192876906ced706fcdf40926f6a7eab7.zip tcl-2a95f6b4192876906ced706fcdf40926f6a7eab7.tar.gz tcl-2a95f6b4192876906ced706fcdf40926f6a7eab7.tar.bz2 | |
[Bug 3598300]: unix: tcl.h does not include sys/stat.h
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tclPort.h | 5 | ||||
| -rw-r--r-- | unix/tclUnixPort.h | 6 | ||||
| -rw-r--r-- | win/tcl.m4 | 8 |
4 files changed, 17 insertions, 7 deletions
@@ -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 */ @@ -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 |