summaryrefslogtreecommitdiffstats
path: root/generic/tclPlatDecls.h
diff options
context:
space:
mode:
authormdejong <mdejong>2001-07-19 06:40:09 (GMT)
committermdejong <mdejong>2001-07-19 06:40:09 (GMT)
commit524b0f2d00b99d18e37e281905c73ec37c565a66 (patch)
treefe7eccd416cacef313f40a0b5962129a67ea87cd /generic/tclPlatDecls.h
parent6cc38d5ff36cfbb941affae49796516273ec66a7 (diff)
downloadtcl-524b0f2d00b99d18e37e281905c73ec37c565a66.zip
tcl-524b0f2d00b99d18e37e281905c73ec37c565a66.tar.gz
tcl-524b0f2d00b99d18e37e281905c73ec37c565a66.tar.bz2
* generic/tclPlatDecls.h: Define TCHAR by including
windows.h instead of tchar.h since Cygwin does not support the tchar.h header. Include CHECK_UNICODE_CALLS logic from tclWinPort.h. * win/tclWinPort.h: Remove CHECK_UNICODE_CALLS logic. Remove include of windows.h since this now done it tclPlatDecls.h. * win/tclWinReg.c: Remove duplicate include of windows.h.
Diffstat (limited to 'generic/tclPlatDecls.h')
-rw-r--r--generic/tclPlatDecls.h32
1 files changed, 25 insertions, 7 deletions
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
index 897d052..7faa605 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -6,20 +6,38 @@
* Copyright (c) 1998-1999 by Scriptics Corporation.
* All rights reserved.
*
- * RCS: @(#) $Id: tclPlatDecls.h,v 1.6 2000/08/20 03:51:23 davidg Exp $
+ * RCS: @(#) $Id: tclPlatDecls.h,v 1.7 2001/07/19 06:40:09 mdejong Exp $
*/
#ifndef _TCLPLATDECLS
#define _TCLPLATDECLS
/*
- * Pull in the definition of TCHAR. Hopefully the compile flags
- * of the core are matching against your project build for these
- * public functions. BE AWARE.
+ * Define TCHAR by pulling in <windows.h>. Hopefully the compile flags
+ * of the Tcl core will match those of your project so that TCHAR
+ * will be defined the same way. BE AWARE.
*/
-#if defined(__WIN32__) && !defined(_INC_TCHAR)
-#include <tchar.h>
-#endif
+
+#ifdef __WIN32__
+
+#ifdef CHECK_UNICODE_CALLS
+
+#define _UNICODE
+#define UNICODE
+
+#define __TCHAR_DEFINED
+typedef float *_TCHAR;
+
+#define _TCHAR_DEFINED
+typedef float *TCHAR;
+
+#endif /* CHECK_UNICODE_CALLS */
+
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+# undef WIN32_LEAN_AND_MEAN
+
+#endif /* __WIN32__ */
/* !BEGIN!: Do not edit below this line. */