diff options
| author | mdejong <mdejong> | 2003-04-14 02:36:57 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2003-04-14 02:36:57 (GMT) |
| commit | 0642c2ce3305c22c76c707fe3a2b4adc74c36c72 (patch) | |
| tree | da9db3b4445736bddeaa994bdd7e2c453a4a5ba8 /win/tclWinFile.c | |
| parent | 37ff37a0b748da5dcebf15c20e744d8573aeb7a6 (diff) | |
| download | tcl-0642c2ce3305c22c76c707fe3a2b4adc74c36c72.zip tcl-0642c2ce3305c22c76c707fe3a2b4adc74c36c72.tar.gz tcl-0642c2ce3305c22c76c707fe3a2b4adc74c36c72.tar.bz2 | |
* win/configure: Regen.
* win/configure.in: Add check for FINDEX_INFO_LEVELS
from winbase.h, known to be a problem in VC++ 5.2.
Define HAVE_NO_FINDEX_ENUMS if the define does not
exist.
* win/tclWinFile.c: Put declarations for
FINDEX_INFO_LEVELS and FINDEX_SEARCH_OPS inside
a check for HAVE_NO_FINDEX_ENUMS so that these are
not declared twice. This fixes the Mingw build.
* win/tclWinTime.c: Rework the init of timeInfo
so that the number or initializers matches the
declaration. This was broken under Mingw. Add
cast to avoid compile warning when calling the
AccumulateSample function.
Diffstat (limited to 'win/tclWinFile.c')
| -rw-r--r-- | win/tclWinFile.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/win/tclWinFile.c b/win/tclWinFile.c index 895747a..faa1759 100644 --- a/win/tclWinFile.c +++ b/win/tclWinFile.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinFile.c,v 1.45 2003/04/11 16:00:13 vincentdarley Exp $ + * RCS: @(#) $Id: tclWinFile.c,v 1.46 2003/04/14 02:36:58 mdejong Exp $ */ //#define _WIN32_WINNT 0x0500 @@ -128,6 +128,7 @@ typedef struct { WCHAR dummyBuf[MAX_PATH*3]; } DUMMY_REPARSE_BUFFER; +#ifdef HAVE_NO_FINDEX_ENUMS /* These two aren't in VC++ 5.2 headers */ typedef enum _FINDEX_INFO_LEVELS { FindExInfoStandard, @@ -139,6 +140,7 @@ typedef enum _FINDEX_SEARCH_OPS { FindExSearchLimitToDevices, FindExSearchMaxSearchOp } FINDEX_SEARCH_OPS; +#endif /* HAVE_NO_FINDEX_ENUMS */ /* Other typedefs required by this code */ |