diff options
| author | mdejong <mdejong@noemail.net> | 2001-07-19 06:40:09 (GMT) |
|---|---|---|
| committer | mdejong <mdejong@noemail.net> | 2001-07-19 06:40:09 (GMT) |
| commit | 13be7a0a386748fbd26f3ba8d4b1549759e0e22d (patch) | |
| tree | fe7eccd416cacef313f40a0b5962129a67ea87cd | |
| parent | 0083a26b852639e15164a868ffa8c67dd3461c75 (diff) | |
| download | tcl-13be7a0a386748fbd26f3ba8d4b1549759e0e22d.zip tcl-13be7a0a386748fbd26f3ba8d4b1549759e0e22d.tar.gz tcl-13be7a0a386748fbd26f3ba8d4b1549759e0e22d.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.
FossilOrigin-Name: 750a94af1da9e3de8c5a743d05420417ebcc8e71
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | generic/tclPlatDecls.h | 32 | ||||
| -rw-r--r-- | win/tclWinPort.h | 19 | ||||
| -rw-r--r-- | win/tclWinReg.c | 6 |
4 files changed, 38 insertions, 30 deletions
@@ -1,3 +1,14 @@ +2001-07-18 Mo DeJong <mdejong@redhat.com> + + * 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. + 2001-07-18 Andreas Kupries <andreas_kupries@users.sourceforge.net> * generic/tclIO.c: Aftermath to [SF #427196]. Squash empty buffers 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. */ 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 |