From f13ecbbf2781ee1d4a22440634ec82f95cb8f9e5 Mon Sep 17 00:00:00 2001 From: nijtmans Date: Tue, 16 Nov 2010 15:06:07 +0000 Subject: [Bug #3110161]: Extensions using TCHAR don't compile on VS2005 SP1 --- ChangeLog | 5 +++++ win/tkWinPort.h | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 66892b3..c3eb391 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-11-16 Jan Nijtmans + + * win/tkWinPort.h [Bug #3110161]: Extensions using TCHAR don't compile + on VS2005 SP1 + 2010-11-04 Jan Nijtmans * library/msgs/de.msg: Updated German messages. Thanks to Ruediger diff --git a/win/tkWinPort.h b/win/tkWinPort.h index 31d020d..2a81782 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.10.4.1 2010/04/19 08:23:31 nijtmans Exp $ + * RCS: @(#) $Id: tkWinPort.h,v 1.10.4.2 2010/11/16 15:06:07 nijtmans Exp $ */ #ifndef _WINPORT @@ -59,6 +59,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 #ifdef __CYGWIN__ -- cgit v0.12