From eae621b1753a248fd1add5b5df1069199e783d2f Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 14 May 2018 19:14:40 +0000 Subject: Unbreak build when HAVE_FTS is not set. Move definitions of Tcl_DirEntry and TclDIR to tclWinPort.h, where it actually belongs --- generic/tclIntPlatDecls.h | 5 ----- unix/tclUnixFCmd.c | 2 +- win/tclWinPort.h | 3 +++ 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h index 5a3025a..4d2bd0a 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 0b79fb6..7360c32 100644 --- a/unix/tclUnixFCmd.c +++ b/unix/tclUnixFCmd.c @@ -920,7 +920,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 b2bf1d7..0f7d1fa 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -474,4 +474,7 @@ typedef DWORD_PTR * PDWORD_PTR; # define LABEL_SECURITY_INFORMATION (0x00000010L) #endif +#define Tcl_DirEntry void +#define TclDIR void + #endif /* _TCLWINPORT */ -- cgit v0.12