diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-09-08 12:22:25 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-09-08 12:22:25 (GMT) |
| commit | 498f733a1bd10ee1f6e8f97a3f8f4021ac9faa1f (patch) | |
| tree | f200dbc1517d00c2c1f81926ce115bc485a9aed2 /unix/tclUnixPort.h | |
| parent | e1f4100c039c4d48b36b43317861594cda900e55 (diff) | |
| parent | 9e2fa9ea7edc34ebf959378f2bdbe0521bd7d2e4 (diff) | |
| download | tcl-498f733a1bd10ee1f6e8f97a3f8f4021ac9faa1f.zip tcl-498f733a1bd10ee1f6e8f97a3f8f4021ac9faa1f.tar.gz tcl-498f733a1bd10ee1f6e8f97a3f8f4021ac9faa1f.tar.bz2 | |
merge 8.6.1
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! */ |