summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2013-01-17 13:46:52 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2013-01-17 13:46:52 (GMT)
commit9ce605684317865fe7851c1cb6712a505934a515 (patch)
treec8ab1107a2f04f107a8af058acfcf88491bc8957
parent9843ac2a949950a8dd51bcba03fbdfcb71d0e48f (diff)
parent4a5ef05df5be16afdfdbf1a38f32d72bb3654f7f (diff)
downloadtcl-9ce605684317865fe7851c1cb6712a505934a515.zip
tcl-9ce605684317865fe7851c1cb6712a505934a515.tar.gz
tcl-9ce605684317865fe7851c1cb6712a505934a515.tar.bz2
merge trunkbug_3600328
-rw-r--r--ChangeLog7
-rw-r--r--generic/tclCmdAH.c1
-rw-r--r--generic/tclEncoding.c1
-rw-r--r--generic/tclFCmd.c1
-rw-r--r--generic/tclFileName.c1
-rw-r--r--generic/tclIOUtil.c4
-rw-r--r--generic/tclPort.h5
-rw-r--r--generic/tclTest.c1
-rw-r--r--macosx/tclMacOSXFCmd.c1
-rw-r--r--unix/tclUnixFCmd.c1
-rw-r--r--unix/tclUnixFile.c1
-rw-r--r--unix/tclUnixInit.c1
-rw-r--r--unix/tclUnixPort.h4
-rw-r--r--win/tclWinFile.c2
14 files changed, 16 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 968057f..23cd2a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,17 +5,12 @@
2013-01-16 Jan Nijtmans <nijtmans@users.sf.net>
- * Makefile.in: Enable win32 build with -DTCL_NO_DEPRECATED, just as
+ * Makefile.in: Allow win32 build with -DTCL_NO_DEPRECATED, just as
* generic/tcl.h: in the UNIX build. Define Tcl_EvalObj and
* generic/tclDecls.h: Tcl_GlobalEvalObj as macros, even when
* generic/tclBasic.c: TCL_NO_DEPRECATED is defined, so Tk can benefit
from it too.
-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, backported
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index eb2a303..820eec5 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -11,6 +11,7 @@
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
+#include <sys/stat.h>
#include "tclInt.h"
#include <locale.h>
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 7a55724..7d2206b 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -9,6 +9,7 @@
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
+#include <sys/stat.h>
#include "tclInt.h"
typedef size_t (LengthProc)(const char *src);
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
index 33c1496..adf60d9 100644
--- a/generic/tclFCmd.c
+++ b/generic/tclFCmd.c
@@ -10,6 +10,7 @@
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
+#include <sys/stat.h>
#include "tclInt.h"
#include "tclFileSystem.h"
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index 5d4702b..193ca4e 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -11,6 +11,7 @@
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
+#include <sys/stat.h>
#include "tclInt.h"
#include "tclRegexp.h"
#include "tclFileSystem.h" /* For TclGetPathType() */
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index ab08353..f523e8f 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -18,9 +18,7 @@
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
-#if defined(HAVE_SYS_STAT_H) && !defined _WIN32
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
#include "tclInt.h"
#ifdef __WIN32__
# include "tclWinInt.h"
diff --git a/generic/tclPort.h b/generic/tclPort.h
index 12a60db..7021b8d 100644
--- a/generic/tclPort.h
+++ b/generic/tclPort.h
@@ -19,10 +19,11 @@
#endif
#if defined(_WIN32)
# include "tclWinPort.h"
-#else
-# include "tclUnixPort.h"
#endif
#include "tcl.h"
+#if !defined(_WIN32)
+# include "tclUnixPort.h"
+#endif
#if !defined(LLONG_MIN)
# ifdef TCL_WIDE_INT_IS_LONG
diff --git a/generic/tclTest.c b/generic/tclTest.c
index a8b27fb..297fe4d 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -19,6 +19,7 @@
#ifndef USE_TCL_STUBS
# define USE_TCL_STUBS
#endif
+#include <sys/stat.h>
#include "tclInt.h"
#include "tclOO.h"
#include <math.h>
diff --git a/macosx/tclMacOSXFCmd.c b/macosx/tclMacOSXFCmd.c
index f266443..6016c6d 100644
--- a/macosx/tclMacOSXFCmd.c
+++ b/macosx/tclMacOSXFCmd.c
@@ -10,6 +10,7 @@
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
+#include <sys/stat.h>
#include "tclInt.h"
#ifdef HAVE_GETATTRLIST
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index 559992f..a703935 100644
--- a/unix/tclUnixFCmd.c
+++ b/unix/tclUnixFCmd.c
@@ -40,6 +40,7 @@
* DAMAGE.
*/
+#include <sys/stat.h>
#include "tclInt.h"
#include <utime.h>
#include <grp.h>
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index 38504d9..f1fedc3 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -10,6 +10,7 @@
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
+#include <sys/stat.h>
#include "tclInt.h"
#include "tclFileSystem.h"
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index f07b123..6653e4b 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -8,6 +8,7 @@
* All rights reserved.
*/
+#include <sys/stat.h>
#include "tclInt.h"
#include <stddef.h>
#include <locale.h>
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index 88cc87e..aa59258 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -126,9 +126,7 @@ typedef off_t Tcl_SeekOffset;
#ifdef HAVE_SYS_SELECT_H
# include <sys/select.h>
#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index a4512ec..19e6abd 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -12,10 +12,10 @@
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
+#include <sys/stat.h>
#include "tclWinInt.h"
#include "tclFileSystem.h"
#include <winioctl.h>
-#include <sys/stat.h>
#include <shlobj.h>
#include <lm.h> /* For TclpGetUserHome(). */