diff options
| author | nijtmans <nijtmans@noemail.net> | 2010-01-31 23:51:35 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans@noemail.net> | 2010-01-31 23:51:35 (GMT) |
| commit | c17fcad12b8c3fb3926709e9db6c1278012be074 (patch) | |
| tree | 012d77fe11409a3025fcb54cc6c78d69b36f953a /generic/tclPort.h | |
| parent | 91b3d55cee9a269ffde875c96f469d350af1bf48 (diff) | |
| download | tcl-c17fcad12b8c3fb3926709e9db6c1278012be074.zip tcl-c17fcad12b8c3fb3926709e9db6c1278012be074.tar.gz tcl-c17fcad12b8c3fb3926709e9db6c1278012be074.tar.bz2 | |
Various CYGWIN-related fixes
backported from HEAD. Still
configure script not modified,
so CYGWIN build is still
disabled. Reason: although the
build succeeds with those changes,
many tests still fail.
FossilOrigin-Name: ad7cfb6ee36931026975da528ab9dbb097c78aa8
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 f2cdfb4..91cc57b 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.15.10.2 2010/01/06 22:02:05 nijtmans Exp $ + * RCS: @(#) $Id: tclPort.h,v 1.15.10.3 2010/01/31 23:51:36 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) |