summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--generic/tclTest.c4
-rw-r--r--win/tclWinFile.c3
-rw-r--r--win/tclWinPort.h5
4 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 5127d2f..877eaa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-22 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * win/tclWinPort.h: [Bug 2935503] Windows: file mtime
+ * win/tclWinFile.c: sets wrong time (VS2005+ only)
+ * generic/tclTest.c:
+
2011-11-04 Don Porter <dgp@users.sourceforge.net>
*** 8.5.11 TAGGED FOR RELEASE ***
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 0f497b0..98208af 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -15,11 +15,11 @@
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
-#include <math.h>
-
#define TCL_TEST
#include "tclInt.h"
+#include <math.h>
+
/*
* Required for Testregexp*Cmd
*/
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 9c95e7a..54cf0cf 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -12,9 +12,6 @@
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
-#ifndef _WIN64
-# define _USE_32BIT_TIME_T
-#endif
#include "tclWinInt.h"
#include "tclFileSystem.h"
#include <winioctl.h>
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index 2cfc715..493b824 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -14,6 +14,11 @@
#ifndef _TCLWINPORT
#define _TCLWINPORT
+#ifndef _WIN64
+/* See [Bug 2935503]: file mtime sets wrong time */
+# define _USE_32BIT_TIME_T
+#endif
+
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN