diff options
| author | sergey.brester <sergey.brester> | 2019-02-12 18:41:24 (GMT) |
|---|---|---|
| committer | sergey.brester <sergey.brester> | 2019-02-12 18:41:24 (GMT) |
| commit | 9a62e42dd654c613c75092b53a0d18e06a319692 (patch) | |
| tree | 76d8881fe627b15359a646751531f9a780133ea7 /unix/tclUnixPort.h | |
| parent | ccbd8395f4a51f5b769998058006ed3d36823ace (diff) | |
| parent | 1dec12d61848ab939bde91eb6e3a095222cf4236 (diff) | |
| download | tcl-9a62e42dd654c613c75092b53a0d18e06a319692.zip tcl-9a62e42dd654c613c75092b53a0d18e06a319692.tar.gz tcl-9a62e42dd654c613c75092b53a0d18e06a319692.tar.bz2 | |
merge 8.5 (note: to avoid too many conflicts, merged using `fossil merge --baseline 0055a16a8b core-8-5-branch`)
Diffstat (limited to 'unix/tclUnixPort.h')
| -rw-r--r-- | unix/tclUnixPort.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index 965014e..9a923ef 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -58,12 +58,23 @@ */ #ifdef HAVE_STRUCT_DIRENT64 -typedef struct dirent64 Tcl_DirEntry; +typedef struct dirent64 Tcl_DirEntry; # define TclOSreaddir readdir64 #else -typedef struct dirent Tcl_DirEntry; +typedef struct dirent Tcl_DirEntry; # define TclOSreaddir readdir #endif +#ifdef HAVE_DIR64 +typedef DIR64 TclDIR; +# define TclOSopendir opendir64 +# define TclOSrewinddir rewinddir64 +# define TclOSclosedir closedir64 +#else +typedef DIR TclDIR; +# define TclOSopendir opendir +# define TclOSrewinddir rewinddir +# define TclOSclosedir closedir +#endif #ifdef HAVE_TYPE_OFF64_T typedef off64_t Tcl_SeekOffset; |