diff options
| author | nijtmans <nijtmans> | 2010-04-20 08:17:20 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-04-20 08:17:20 (GMT) |
| commit | 64c4b08a44ece02ac3c52d893e73c98b5e8f6cc5 (patch) | |
| tree | b14b56efeb6e96f005aa0454f988f6b043fc40ab /generic | |
| parent | f76376d447ad977082d1744f9e90040047b5d08e (diff) | |
| download | tk-64c4b08a44ece02ac3c52d893e73c98b5e8f6cc5.zip tk-64c4b08a44ece02ac3c52d893e73c98b5e8f6cc5.tar.gz tk-64c4b08a44ece02ac3c52d893e73c98b5e8f6cc5.tar.bz2 | |
Make sure that tkWinPort.h is always included
before tcl.h, otherwise the fallback for TCHAR
might go off before the inclusion of <tchar.h>
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkIntXlibDecls.h | 18 | ||||
| -rw-r--r-- | generic/tkPort.h | 15 |
2 files changed, 17 insertions, 16 deletions
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h index 5ff2314..9d34993 100644 --- a/generic/tkIntXlibDecls.h +++ b/generic/tkIntXlibDecls.h @@ -9,12 +9,22 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.29 2010/02/05 10:56:43 nijtmans Exp $ + * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.30 2010/04/20 08:17:22 nijtmans Exp $ */ #ifndef _TKINTXLIBDECLS #define _TKINTXLIBDECLS +/* + * WARNING: This file is automatically generated by the tools/genStubs.tcl + * script. Any modifications to the function declarations below should be made + * in the generic/tkInt.decls script. + */ + +#ifndef _TCL +# include <tcl.h> +#endif + #include "X11/Xutil.h" #ifdef BUILD_tk @@ -22,12 +32,6 @@ #define TCL_STORAGE_CLASS DLLEXPORT #endif -/* - * WARNING: This file is automatically generated by the tools/genStubs.tcl - * script. Any modifications to the function declarations below should be made - * in the generic/tkInt.decls script. - */ - /* !BEGIN!: Do not edit below this line. */ /* diff --git a/generic/tkPort.h b/generic/tkPort.h index 17d0def..f19fb34 100644 --- a/generic/tkPort.h +++ b/generic/tkPort.h @@ -10,22 +10,19 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkPort.h,v 1.6 2004/04/24 06:00:18 das Exp $ + * RCS: @(#) $Id: tkPort.h,v 1.7 2010/04/20 08:17:20 nijtmans Exp $ */ #ifndef _TKPORT #define _TKPORT -#ifndef _TK -#include "tk.h" +#if defined(_WIN32) +# include "tkWinPort.h" #endif -#ifndef _TCL -#include "tcl.h" +#ifndef _TK +# include "tk.h" #endif - -#if defined(__WIN32__) || defined(_WIN32) -# include "tkWinPort.h" -#else +#if !defined(_WIN32) # if defined(MAC_OSX_TK) # include "tkMacOSXPort.h" # else |