summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <jan.nijtmans@noemail.net>2013-02-20 11:40:10 (GMT)
committerjan.nijtmans <jan.nijtmans@noemail.net>2013-02-20 11:40:10 (GMT)
commit756d87626427f4d74ec0bdb0bd3eef2323f2e021 (patch)
tree10e1cff358c65cd963e69e2dbde31847287c96f7
parent9dc9bc0d4140ec34be940f42b831946c39f5f0ff (diff)
downloadtcl-756d87626427f4d74ec0bdb0bd3eef2323f2e021.zip
tcl-756d87626427f4d74ec0bdb0bd3eef2323f2e021.tar.gz
tcl-756d87626427f4d74ec0bdb0bd3eef2323f2e021.tar.bz2
[Bug 3605401]: Compiler error with latest mingw-w64 headers.
FossilOrigin-Name: 0db74d9ccccf75432cfcb7c151d0dae43201ed32
-rw-r--r--ChangeLog5
-rw-r--r--win/tclWinDde.c5
-rw-r--r--win/tclWinReg.c6
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index d221786..15e0008 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-20 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * win/tclWinDde.c: [Bug 3605401]: Compiler error with latest mingw-w64
+ headers.
+
2013-02-19 Jan Nijtmans <nijtmans@users.sf.net>
* generic/tclTrace.c: [Bug 2438181]: Incorrect error reporting in
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 94b4e4c..ce0b413 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -11,8 +11,9 @@
*/
#undef STATIC_BUILD
-#undef USE_TCL_STUBS
-#define USE_TCL_STUBS
+#ifndef USE_TCL_STUBS
+# define USE_TCL_STUBS
+#endif
#include "tclInt.h"
#include <dde.h>
#include <ddeml.h>
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index 6ac5caf..327e4a3 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -13,9 +13,9 @@
*/
#undef STATIC_BUILD
-#undef USE_TCL_STUBS
-#define USE_TCL_STUBS
-
+#ifndef USE_TCL_STUBS
+# define USE_TCL_STUBS
+#endif
#include "tclInt.h"
#ifdef _MSC_VER
# pragma comment (lib, "advapi32.lib")