summaryrefslogtreecommitdiffstats
path: root/win
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 /win
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 'win')
-rw-r--r--win/tclWinPort.h19
-rw-r--r--win/tclWinReg.c6
2 files changed, 2 insertions, 23 deletions
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index 3b223b8..dd4d25e 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.16 2001/07/17 18:33:24 mdejong Exp $
+ * RCS: @(#) $Id: tclWinPort.h,v 1.17 2001/07/19 06:40:09 mdejong Exp $
*/
#ifndef _TCLWINPORT
@@ -20,19 +20,6 @@
# 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
@@ -66,10 +53,6 @@ typedef float *TCHAR;
#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
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index b5931fc..5799f86 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -11,16 +11,12 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWinReg.c,v 1.12 2000/06/13 20:30:24 ericm Exp $
+ * RCS: @(#) $Id: tclWinReg.c,v 1.13 2001/07/19 06:40:09 mdejong Exp $
*/
#include <tclPort.h>
#include <stdlib.h>
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-
/*
* TCL_STORAGE_CLASS is set unconditionally to DLLEXPORT because the
* Registry_Init declaration is in the source file itself, which is only