diff options
| author | dgp@users.sourceforge.net <dgp> | 2013-08-14 18:00:45 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2013-08-14 18:00:45 (GMT) |
| commit | 2d5f9a54bbde63c57647146525111d1dd979c313 (patch) | |
| tree | 77fdf9d45381002ae272a660dd3090c4d9459dc5 /unix/tclUnixPort.h | |
| parent | e74b0d63f7921a708b9279175ef411cd70dc907e (diff) | |
| parent | 88a7ce8860bbf63969789f3466b2c751f5044d70 (diff) | |
| download | tcl-2d5f9a54bbde63c57647146525111d1dd979c313.zip tcl-2d5f9a54bbde63c57647146525111d1dd979c313.tar.gz tcl-2d5f9a54bbde63c57647146525111d1dd979c313.tar.bz2 | |
merge trunk
Diffstat (limited to 'unix/tclUnixPort.h')
| -rw-r--r-- | unix/tclUnixPort.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index 636c760..2ade1c0 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -99,9 +99,11 @@ typedef off_t Tcl_SeekOffset; # define USE_PUTENV 1 # define USE_PUTENV_FOR_UNSET 1 /* On Cygwin, the environment is imported from the Cygwin DLL. */ +#ifndef __x86_64__ # define environ __cygwin_environ -# define timezone _timezone extern char **__cygwin_environ; +#endif +# define timezone _timezone extern int TclOSstat(const char *name, void *statBuf); extern int TclOSlstat(const char *name, void *statBuf); #elif defined(HAVE_STRUCT_STAT64) && !defined(__APPLE__) @@ -698,8 +700,6 @@ typedef int socklen_t; #ifdef TCL_THREADS # include <pthread.h> -# undef inet_ntoa -# define inet_ntoa(x) TclpInetNtoa(x) #endif /* TCL_THREADS */ /* FIXME - Hyper-enormous platform assumption! */ |