diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-05-14 19:16:24 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-05-14 19:16:24 (GMT) |
| commit | 7672af7212bf3921fe55e99fe298e720d2d5b8d9 (patch) | |
| tree | 3fed0a43f877cee9c47e35f4ef11c42f8b4369cf | |
| parent | 6d0cc0c5897a75f5dceb43df349d32f371c98fcf (diff) | |
| parent | eae621b1753a248fd1add5b5df1069199e783d2f (diff) | |
| download | tcl-7672af7212bf3921fe55e99fe298e720d2d5b8d9.zip tcl-7672af7212bf3921fe55e99fe298e720d2d5b8d9.tar.gz tcl-7672af7212bf3921fe55e99fe298e720d2d5b8d9.tar.bz2 | |
merge 8.5
| -rw-r--r-- | generic/tclIntPlatDecls.h | 5 | ||||
| -rw-r--r-- | unix/tclUnixFCmd.c | 2 | ||||
| -rw-r--r-- | win/tclWinPort.h | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h index 367bab0..903327f 100644 --- a/generic/tclIntPlatDecls.h +++ b/generic/tclIntPlatDecls.h @@ -13,11 +13,6 @@ #ifndef _TCLINTPLATDECLS #define _TCLINTPLATDECLS -#ifdef _WIN32 -# define Tcl_DirEntry void -# define TclDIR void -#endif - #undef TCL_STORAGE_CLASS #ifdef BUILD_tcl # define TCL_STORAGE_CLASS DLLEXPORT diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c index 471cf97..ae20ee0 100644 --- a/unix/tclUnixFCmd.c +++ b/unix/tclUnixFCmd.c @@ -965,7 +965,7 @@ TraverseUnixTree( #ifndef HAVE_FTS int numProcessed = 0; Tcl_DirEntry *dirEntPtr; - Tcl_Dir *dirPtr; + TclDIR *dirPtr; #else const char *paths[2] = {NULL, NULL}; FTS *fts = NULL; diff --git a/win/tclWinPort.h b/win/tclWinPort.h index 159a708..29b1447 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -568,4 +568,7 @@ typedef DWORD_PTR * PDWORD_PTR; # define LABEL_SECURITY_INFORMATION (0x00000010L) #endif +#define Tcl_DirEntry void +#define TclDIR void + #endif /* _TCLWINPORT */ |