diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-05-11 08:10:17 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-05-11 08:10:17 (GMT) |
| commit | ede72e80ac6b2914a5a39e2363d62765252e43cd (patch) | |
| tree | 7f5282fd80947c44d7342a55910b600d62384a42 /unix | |
| parent | f7f4cbb151166b044128faec1b875973f6b0fbc8 (diff) | |
| parent | 7bf3f83abd5bc0e24dbd3f02765b7e86d7ba1fa7 (diff) | |
| download | tcl-ede72e80ac6b2914a5a39e2363d62765252e43cd.zip tcl-ede72e80ac6b2914a5a39e2363d62765252e43cd.tar.gz tcl-ede72e80ac6b2914a5a39e2363d62765252e43cd.tar.bz2 | |
merge 8.5
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tclUnixFCmd.c | 2 | ||||
| -rw-r--r-- | unix/tclUnixFile.c | 2 | ||||
| -rw-r--r-- | unix/tclUnixPort.h | 4 | ||||
| -rw-r--r-- | unix/tclUnixThrd.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c index 3e24538..471cf97 100644 --- a/unix/tclUnixFCmd.c +++ b/unix/tclUnixFCmd.c @@ -369,7 +369,7 @@ DoRenameFile( if (errno == EINVAL && haveRealpath) { char srcPath[MAXPATHLEN], dstPath[MAXPATHLEN]; - Tcl_Dir *dirPtr; + TclDIR *dirPtr; Tcl_DirEntry *dirEntPtr; if ((Realpath((char *) src, srcPath) != NULL) /* INTL: Native. */ diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c index 0e8e24a..5684b16 100644 --- a/unix/tclUnixFile.c +++ b/unix/tclUnixFile.c @@ -259,7 +259,7 @@ TclpMatchInDirectory( Tcl_DecrRefCount(tailPtr); Tcl_DecrRefCount(fileNamePtr); } else { - Tcl_Dir *d; + TclDIR *d; Tcl_DirEntry *entryPtr; const char *dirName; int dirLength, nativeDirLen; diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index 3cb11a2..c4b7fd2 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -57,14 +57,14 @@ */ #ifdef HAVE_STRUCT_DIRENT64 -typedef DIR64 Tcl_Dir; +typedef DIR64 TclDIR; typedef struct dirent64 Tcl_DirEntry; # define TclOSreaddir readdir64 # define TclOSopendir opendir64 # define TclOSrewinddir rewinddir64 # define TclOSclosedir closedir64 #else -typedef DIR Tcl_Dir; +typedef DIR TclDIR; typedef struct dirent Tcl_DirEntry; # define TclOSreaddir readdir # define TclOSopendir opendir diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c index 908f93b..0476d85 100644 --- a/unix/tclUnixThrd.c +++ b/unix/tclUnixThrd.c @@ -653,7 +653,7 @@ TclpFinalizeCondition( Tcl_DirEntry * TclpReaddir( - Tcl_Dir * dir) + TclDIR * dir) { return TclOSreaddir(dir); } |