summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-11-16 15:07:08 (GMT)
committernijtmans <nijtmans>2010-11-16 15:07:08 (GMT)
commit5ef365fdab367ccef3891c8f167b938c0216e7c3 (patch)
treecd6479fd4947b518227e9ae10b4fbce548958ff6
parentf1c7fea84dca36312c54c8513abc7253d10838a2 (diff)
downloadtk-5ef365fdab367ccef3891c8f167b938c0216e7c3.zip
tk-5ef365fdab367ccef3891c8f167b938c0216e7c3.tar.gz
tk-5ef365fdab367ccef3891c8f167b938c0216e7c3.tar.bz2
[Bug #3110161]: Extensions using TCHAR don't compile on VS2005 SP1
-rw-r--r--ChangeLog2
-rw-r--r--win/tkWinPort.h6
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index aa2284c..e8d0b70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
* win/tcl.m4 to reality. See for what's missing:
* <https://sourceforge.net/apps/trac/mingw-w64/wiki/Unicode%20apps>
* win/configure (re-generated)
+ * win/tkWinPort.h [Bug #3110161]: Extensions using TCHAR don't compile
+ on VS2005 SP1
2010-11-10 Andreas Kupries <andreask@activestate.com>
diff --git a/win/tkWinPort.h b/win/tkWinPort.h
index 68dfe8b..32ceb05 100644
--- a/win/tkWinPort.h
+++ b/win/tkWinPort.h
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinPort.h,v 1.17 2010/09/10 08:59:26 nijtmans Exp $
+ * RCS: @(#) $Id: tkWinPort.h,v 1.18 2010/11/16 15:07:08 nijtmans Exp $
*/
#ifndef _WINPORT
@@ -60,6 +60,10 @@
typedef _TCHAR TCHAR;
# define _TCHAR_DEFINED
#endif
+#if defined(_MSC_VER) && defined(__STDC__)
+ /* VS2005 SP1 misses this. See [Bug #3110161] */
+ typedef _TCHAR TCHAR;
+#endif
#include <X11/Xlib.h>
#include <X11/cursorfont.h>