diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-05-23 20:09:24 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-05-23 20:09:24 (GMT) |
| commit | ca0f6f2273f4dd8d7b7449a4da43e34d5a98d4f2 (patch) | |
| tree | 3e0b07f6812a5848ee549cc167985bb03acf98da /unix/tclUnixPort.h | |
| parent | b013797f961380e6a2ddd366c96c570d736bd746 (diff) | |
| parent | a9e7c22c38a58f2248f2bd51529411914cd16e06 (diff) | |
| download | tcl-ca0f6f2273f4dd8d7b7449a4da43e34d5a98d4f2.zip tcl-ca0f6f2273f4dd8d7b7449a4da43e34d5a98d4f2.tar.gz tcl-ca0f6f2273f4dd8d7b7449a4da43e34d5a98d4f2.tar.bz2 | |
merge trunk
Diffstat (limited to 'unix/tclUnixPort.h')
| -rw-r--r-- | unix/tclUnixPort.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index 98d641e..64417e7 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -57,11 +57,19 @@ */ #ifdef HAVE_STRUCT_DIRENT64 +typedef DIR64 TclDIR; typedef struct dirent64 Tcl_DirEntry; # define TclOSreaddir readdir64 +# define TclOSopendir opendir64 +# define TclOSrewinddir rewinddir64 +# define TclOSclosedir closedir64 #else +typedef DIR TclDIR; typedef struct dirent Tcl_DirEntry; # define TclOSreaddir readdir +# define TclOSopendir opendir +# define TclOSrewinddir rewinddir +# define TclOSclosedir closedir #endif #ifdef HAVE_TYPE_OFF64_T @@ -602,10 +610,8 @@ extern char ** environ; # undef HAVE_COPYFILE # endif # if MAC_OS_X_VERSION_MAX_ALLOWED < 1030 -# ifdef TCL_THREADS - /* prior to 10.3, realpath is not threadsafe, c.f. bug 711232 */ -# define NO_REALPATH 1 -# endif + /* prior to 10.3, realpath is not threadsafe, c.f. bug 711232 */ +# define NO_REALPATH 1 # undef HAVE_LANGINFO # endif # endif /* MAC_OS_X_VERSION_MAX_ALLOWED */ @@ -678,7 +684,7 @@ typedef int socklen_t; #define TclpExit exit -#ifdef TCL_THREADS +#if !defined(TCL_THREADS) || TCL_THREADS # include <pthread.h> #endif /* TCL_THREADS */ |