diff options
| author | dgp <dgp@users.sourceforge.net> | 2018-05-09 15:49:27 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2018-05-09 15:49:27 (GMT) |
| commit | 35d6c2453ebc0785adfb56cf3d125090f967aa57 (patch) | |
| tree | c206fd11bb7ebf04f4454a245775b4969236a13d /unix | |
| parent | 7855612da63e86b43a8a5beb0ad495e6605a2d93 (diff) | |
| parent | f7f4cbb151166b044128faec1b875973f6b0fbc8 (diff) | |
| download | tcl-35d6c2453ebc0785adfb56cf3d125090f967aa57.zip tcl-35d6c2453ebc0785adfb56cf3d125090f967aa57.tar.gz tcl-35d6c2453ebc0785adfb56cf3d125090f967aa57.tar.bz2 | |
merge 8.6
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 7250e87..d4bb376 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 5215bdf..9772867 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; size_t dirLength, nativeDirLen; diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index 8e71b3a..6cc6836 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 6fa837c..adef543 100644 --- a/unix/tclUnixThrd.c +++ b/unix/tclUnixThrd.c @@ -649,7 +649,7 @@ TclpFinalizeCondition( #ifndef TCL_NO_DEPRECATED Tcl_DirEntry * TclpReaddir( - DIR * dir) + Tcl_Dir * dir) { return TclOSreaddir(dir); } |