diff options
| author | sebres <sebres@users.sourceforge.net> | 2018-05-09 10:29:33 (GMT) |
|---|---|---|
| committer | sebres <sebres@users.sourceforge.net> | 2018-05-09 10:29:33 (GMT) |
| commit | f5e87513071af9794d48e1b5c1b106343f4bca1f (patch) | |
| tree | 5edaaf34fde5ff260c8884e3f238f064205619c4 /unix | |
| parent | 78ee8c697e423a5b4718fabb53eef1c5f6a2a2b1 (diff) | |
| download | tcl-f5e87513071af9794d48e1b5c1b106343f4bca1f.zip tcl-f5e87513071af9794d48e1b5c1b106343f4bca1f.tar.gz tcl-f5e87513071af9794d48e1b5c1b106343f4bca1f.tar.bz2 | |
amend to [85bcf84100]: replaces DIR with Tcl_Dir (DIR/DIR64 regarding HAVE_STRUCT_DIRENT64)
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 4377b77..f4a35af 100644 --- a/unix/tclUnixFCmd.c +++ b/unix/tclUnixFCmd.c @@ -327,7 +327,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. */ @@ -920,7 +920,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 1dc73ae..95642b1 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; diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index cc31bf9..58509b0 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -58,12 +58,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 1841242..9401c77 100644 --- a/unix/tclUnixThrd.c +++ b/unix/tclUnixThrd.c @@ -742,7 +742,7 @@ TclpFinalizeCondition( Tcl_DirEntry * TclpReaddir( - DIR * dir) + Tcl_Dir * dir) { return TclOSreaddir(dir); } |