summaryrefslogtreecommitdiffstats
path: root/generic/tclPlatDecls.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-07 06:33:12 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-07 06:33:12 (GMT)
commite40e34cb04d940b132e66ccd21b3018a68ffe3f7 (patch)
treece636b6d780ba4a747644cdcc679f3359fe92bce /generic/tclPlatDecls.h
parent05859b921e7478bb5202dcc464028b7b25db7a43 (diff)
downloadtcl-e40e34cb04d940b132e66ccd21b3018a68ffe3f7.zip
tcl-e40e34cb04d940b132e66ccd21b3018a68ffe3f7.tar.gz
tcl-e40e34cb04d940b132e66ccd21b3018a68ffe3f7.tar.bz2
move TCHAR definition for Cygwin from tclUnixPort.h to tclPlatDecls.h,
so it can be used for the Plat* interfaces as well
Diffstat (limited to 'generic/tclPlatDecls.h')
-rw-r--r--generic/tclPlatDecls.h19
1 files changed, 8 insertions, 11 deletions
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
index 3be40cb..02191ca 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -11,19 +11,16 @@
#define _TCLPLATDECLS
/*
- * Pull in the typedef of TCHAR for windows.
+ * TCHAR is needed here for win32, so if it is not defined yet do it here.
+ * This way, we don't need to include <tchar.h> just for one define.
*/
-#if defined(__WIN32__) && !defined(_TCHAR_DEFINED)
-# include <tchar.h>
-# ifndef _TCHAR_DEFINED
- /* Borland seems to forget to set this. */
- typedef _TCHAR TCHAR;
-# define _TCHAR_DEFINED
-# endif
-# if defined(_MSC_VER) && defined(__STDC__)
- /* MSVC++ misses this. */
- typedef _TCHAR TCHAR;
+#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(_TCHAR_DEFINED)
+# if defined(_UNICODE)
+ typedef wchar_t TCHAR;
+# else
+ typedef char TCHAR;
# endif
+# define _TCHAR_DEFINED
#endif
/* !BEGIN!: Do not edit below this line. */