summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-04-15 13:58:44 (GMT)
committernijtmans <nijtmans>2010-04-15 13:58:44 (GMT)
commitdb01c2c09b47edf7346c5179c24675864c03d1f9 (patch)
tree96f83479f2f1ad77df6267467be146d8e7018a9b /win
parentd38a5b66d8690611d238c2510750e024cc9570a9 (diff)
downloadtcl-db01c2c09b47edf7346c5179c24675864c03d1f9.zip
tcl-db01c2c09b47edf7346c5179c24675864c03d1f9.tar.gz
tcl-db01c2c09b47edf7346c5179c24675864c03d1f9.tar.bz2
Move inclusion of <tchar.h> from tclPlatDecls.h
to tclWinPort.h, where it belongs. Add fallback in tcl.h, so at least TCHAR typedef is always available in win32, even without <tchar.h> Tk already did the same in tkWinPort.h, now Tcl does it the same (correct) way.
Diffstat (limited to 'win')
-rw-r--r--win/tclWinPort.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index b5edc6e..204181f 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.55 2010/04/13 13:37:28 nijtmans Exp $
+ * RCS: @(#) $Id: tclWinPort.h,v 1.56 2010/04/15 13:58:44 nijtmans Exp $
*/
#ifndef _TCLWINPORT
@@ -36,6 +36,18 @@
#endif /* CHECK_UNICODE_CALLS */
/*
+ * Pull in the typedef of TCHAR for windows.
+ */
+#if !defined(_TCHAR_DEFINED)
+# include <tchar.h>
+# ifndef _TCHAR_DEFINED
+ /* Borland seems to forget to set this. */
+ typedef _TCHAR TCHAR;
+# define _TCHAR_DEFINED
+# endif
+#endif
+
+/*
*---------------------------------------------------------------------------
* The following sets of #includes and #ifdefs are required to get Tcl to
* compile under the windows compilers.