diff options
| author | nijtmans <nijtmans> | 2010-01-22 13:02:50 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-01-22 13:02:50 (GMT) |
| commit | 054ab462a502b5dd37f904ad14e46190554dd8ba (patch) | |
| tree | 55e1b5a3324a9e4ba5914c4e528a6d7c4f81933d /generic/tclPort.h | |
| parent | cc52b4d3c7d8a2d088216976f32ca253b404c75d (diff) | |
| download | tcl-054ab462a502b5dd37f904ad14e46190554dd8ba.zip tcl-054ab462a502b5dd37f904ad14e46190554dd8ba.tar.gz tcl-054ab462a502b5dd37f904ad14e46190554dd8ba.tar.bz2 | |
Revert [2009-12-21] change in tcl.h, in stead
resolve the CYGWIN inclusion problems by
re-arranging the inclusions at other places.
Make cygwin configuration error into
a warning: CYGWIN compilation works
although there still are test failures.
Diffstat (limited to 'generic/tclPort.h')
| -rw-r--r-- | generic/tclPort.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/generic/tclPort.h b/generic/tclPort.h index 0b4eda9..e9d6046 100644 --- a/generic/tclPort.h +++ b/generic/tclPort.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: tclPort.h,v 1.17 2009/12/21 23:25:39 nijtmans Exp $ + * RCS: @(#) $Id: tclPort.h,v 1.18 2010/01/22 13:02:50 nijtmans Exp $ */ #ifndef _TCLPORT @@ -19,11 +19,11 @@ #ifdef HAVE_TCL_CONFIG_H #include "tclConfig.h" #endif -#include "tcl.h" - -#if defined(__WIN32__) +#if defined(_WIN32) # include "tclWinPort.h" -#else +#endif +#include "tcl.h" +#if !defined(_WIN32) # include "tclUnixPort.h" #endif @@ -33,8 +33,8 @@ /* On Cygwin, the environment is imported from the Cygwin DLL. */ DLLIMPORT extern char **__cygwin_environ; DLLIMPORT extern int cygwin_conv_to_win32_path(const char *, char *); -# define environ __cygwin_environ -# define timezone _timezone +# define environ __cygwin_environ +# define timezone _timezone #endif #if !defined(LLONG_MIN) |