From ae05668834c34d70dd008a776d47c8bf8cd8e041 Mon Sep 17 00:00:00 2001
From: nijtmans <nijtmans>
Date: Tue, 16 Nov 2010 14:57:07 +0000
Subject: [Bug #3110161]: Extensions using TCHAR don't compile on VS2005 SP1

---
 ChangeLog        | 2 ++
 win/tclWinPort.h | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 073b151..8388e7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 	* win/cat.c        to reality. See for what's missing:
 	* win/tcl.m4       <https://sourceforge.net/apps/trac/mingw-w64/wiki/Unicode%20apps>
 	* win/configure    (re-generated)
+	* win/tclWinPort.h [Bug #3110161]: Extensions using TCHAR don't compile
+	on VS2005 SP1
 
 2010-11-15  Andreas Kupries  <andreask@activestate.com>
 
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index 084d97b..22d523e 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.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: tclWinPort.h,v 1.62 2010/09/28 15:13:55 rmax Exp $
+ * RCS: @(#) $Id: tclWinPort.h,v 1.63 2010/11/16 14:57:07 nijtmans Exp $
  */
 
 #ifndef _TCLWINPORT
@@ -58,6 +58,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
 
 /*
  *---------------------------------------------------------------------------
-- 
cgit v0.12