summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authormdejong <mdejong>2001-08-02 20:15:40 (GMT)
committermdejong <mdejong>2001-08-02 20:15:40 (GMT)
commit38c017fab26e169e2f1201d1d1abdd756d93000c (patch)
tree4c0651659ddc2d0ca9eef97c4e9e42a694a297d5 /win
parent66c75d0f01c6bf62380cdcae36801befc1b519d3 (diff)
downloadtcl-38c017fab26e169e2f1201d1d1abdd756d93000c.zip
tcl-38c017fab26e169e2f1201d1d1abdd756d93000c.tar.gz
tcl-38c017fab26e169e2f1201d1d1abdd756d93000c.tar.bz2
* generic/tclPlatDecls.h:
* win/tclWinPort.h: Revert <tchar.h> related changes made to improve Cygwin support on 2001-07-18. This change ended up breaking the VC++ build because of conflicts between Windows APIs and internal Tk APIs.
Diffstat (limited to 'win')
-rw-r--r--win/tclWinPort.h19
1 files changed, 18 insertions, 1 deletions
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index dd4d25e..aa85de4 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.17 2001/07/19 06:40:09 mdejong Exp $
+ * RCS: @(#) $Id: tclWinPort.h,v 1.18 2001/08/02 20:15:40 mdejong Exp $
*/
#ifndef _TCLWINPORT
@@ -20,6 +20,19 @@
# include "tclInt.h"
#endif
+#ifdef CHECK_UNICODE_CALLS
+
+#define _UNICODE
+#define UNICODE
+
+#define __TCHAR_DEFINED
+typedef float *_TCHAR;
+
+#define _TCHAR_DEFINED
+typedef float *TCHAR;
+
+#endif
+
/*
*---------------------------------------------------------------------------
* The following sets of #includes and #ifdefs are required to get Tcl to
@@ -53,6 +66,10 @@
#include <time.h>
#include <winsock.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+
#ifdef BUILD_tcl
# undef TCL_STORAGE_CLASS
# define TCL_STORAGE_CLASS DLLEXPORT