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/tkPort.h | |
| 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/tkPort.h')
| -rw-r--r-- | generic/tkPort.h | 15 |
1 files changed, 6 insertions, 9 deletions
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 |