From 38c017fab26e169e2f1201d1d1abdd756d93000c Mon Sep 17 00:00:00 2001
From: mdejong <mdejong>
Date: Thu, 2 Aug 2001 20:15:40 +0000
Subject: 	* 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.

---
 ChangeLog              |  9 +++++++++
 generic/tclPlatDecls.h | 32 +++++++-------------------------
 win/tclWinPort.h       | 19 ++++++++++++++++++-
 3 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2d62d58..29d87c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-08-02  Mo DeJong  <mdejong@redhat.com>
+
+	* 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.
+
 2001-07-31  Vince Darley <vincentdarley@users.sourceforge.net>
 
         Changes from TIP#17 "Redo Tcl's filesystem"
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
index 7faa605..209de2d 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -6,38 +6,20 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tclPlatDecls.h,v 1.7 2001/07/19 06:40:09 mdejong Exp $
+ * RCS: @(#) $Id: tclPlatDecls.h,v 1.8 2001/08/02 20:15:40 mdejong Exp $
  */
 
 #ifndef _TCLPLATDECLS
 #define _TCLPLATDECLS
 
 /*
- *  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.
+ *  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.
  */
-
-#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__ */
+#if defined(__WIN32__) && !defined(_INC_TCHAR)
+#include <tchar.h>
+#endif
 
 /* !BEGIN!: Do not edit below this line. */
 
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
-- 
cgit v0.12