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

---
 ChangeLog              | 5 +++++
 generic/tclPlatDecls.h | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3fcedae..1401f3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-16  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tclPlatDecls.h [Bug #3110161]: Extensions using TCHAR don't compile
+	on VS2005 SP1
+
 2010-11-15  Andreas Kupries  <andreask@activestate.com>
 
 	* doc/interp.n: [3081184] TIP #378.
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
index 7597527..3fd8bf7 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -6,7 +6,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tclPlatDecls.h,v 1.27.2.2 2010/05/21 12:18:17 nijtmans Exp $
+ * RCS: @(#) $Id: tclPlatDecls.h,v 1.27.2.3 2010/11/16 14:57:46 nijtmans Exp $
  */
 
 #ifndef _TCLPLATDECLS
@@ -33,6 +33,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
 #endif
 
 /* !BEGIN!: Do not edit below this line. */
-- 
cgit v0.12