diff options
| author | sebres <sebres@users.sourceforge.net> | 2018-05-09 10:34:44 (GMT) |
|---|---|---|
| committer | sebres <sebres@users.sourceforge.net> | 2018-05-09 10:34:44 (GMT) |
| commit | f7f4cbb151166b044128faec1b875973f6b0fbc8 (patch) | |
| tree | 355704397cdacf5c198234d278fbe8581b86f886 /unix | |
| parent | 47e9dbdc37939a6e874afd15d6586864649f23c7 (diff) | |
| parent | f5e87513071af9794d48e1b5c1b106343f4bca1f (diff) | |
| download | tcl-f7f4cbb151166b044128faec1b875973f6b0fbc8.zip tcl-f7f4cbb151166b044128faec1b875973f6b0fbc8.tar.gz tcl-f7f4cbb151166b044128faec1b875973f6b0fbc8.tar.bz2 | |
merge 8.5
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tclUnixFCmd.c | 4 | ||||
| -rw-r--r-- | unix/tclUnixFile.c | 2 | ||||
| -rw-r--r-- | unix/tclUnixPort.h | 2 | ||||
| -rw-r--r-- | unix/tclUnixThrd.c | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c index d45ac18..3e24538 100644 --- a/unix/tclUnixFCmd.c +++ b/unix/tclUnixFCmd.c @@ -369,7 +369,7 @@ DoRenameFile( if (errno == EINVAL && haveRealpath) { char srcPath[MAXPATHLEN], dstPath[MAXPATHLEN]; - DIR *dirPtr; + Tcl_Dir *dirPtr; Tcl_DirEntry *dirEntPtr; if ((Realpath((char *) src, srcPath) != NULL) /* INTL: Native. */ @@ -965,7 +965,7 @@ TraverseUnixTree( #ifndef HAVE_FTS int numProcessed = 0; Tcl_DirEntry *dirEntPtr; - DIR *dirPtr; + Tcl_Dir *dirPtr; #else const char *paths[2] = {NULL, NULL}; FTS *fts = NULL; diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c index b61a0df..0e8e24a 100644 --- a/unix/tclUnixFile.c +++ b/unix/tclUnixFile.c @@ -259,7 +259,7 @@ TclpMatchInDirectory( Tcl_DecrRefCount(tailPtr); Tcl_DecrRefCount(fileNamePtr); } else { - DIR *d; + Tcl_Dir *d; Tcl_DirEntry *entryPtr; const char *dirName; int dirLength, nativeDirLen; diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index ef6d6d3..3cb11a2 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -57,12 +57,14 @@ */ #ifdef HAVE_STRUCT_DIRENT64 +typedef DIR64 Tcl_Dir; typedef struct dirent64 Tcl_DirEntry; # define TclOSreaddir readdir64 # define TclOSopendir opendir64 # define TclOSrewinddir rewinddir64 # define TclOSclosedir closedir64 #else +typedef DIR Tcl_Dir; typedef struct dirent Tcl_DirEntry; # define TclOSreaddir readdir # define TclOSopendir opendir diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c index 9757e4e..908f93b 100644 --- a/unix/tclUnixThrd.c +++ b/unix/tclUnixThrd.c @@ -653,7 +653,7 @@ TclpFinalizeCondition( Tcl_DirEntry * TclpReaddir( - DIR * dir) + Tcl_Dir * dir) { return TclOSreaddir(dir); } |