summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2010-09-16 18:53:05 (GMT)
committerhobbs <hobbs>2010-09-16 18:53:05 (GMT)
commit03e22d0be578c5b8bd67f3a4deac0feedcaf7f14 (patch)
tree14e5891a85a4f168eebdfa008481c7ecc306911d
parent66dbe859f32e92636a348c8e61eac80606c30d1e (diff)
downloadtcl-03e22d0be578c5b8bd67f3a4deac0feedcaf7f14.zip
tcl-03e22d0be578c5b8bd67f3a4deac0feedcaf7f14.tar.gz
tcl-03e22d0be578c5b8bd67f3a4deac0feedcaf7f14.tar.bz2
* win/tclWinFile.c: remove define of FINDEX_INFO_LEVELS as all
supported versions of compilers should now have it.
-rw-r--r--ChangeLog3
-rw-r--r--win/tclWinFile.c24
2 files changed, 4 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index c2ff9f9..c17e7a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2010-09-16 Jeff Hobbs <jeffh@ActiveState.com>
+ * win/tclWinFile.c: remove define of FINDEX_INFO_LEVELS as all
+ supported versions of compilers should now have it.
+
* unix/Makefile.in: do not pass current build env vars when using
NATIVE_TCLSH in targets.
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index cb055ac..4ff3a51 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.108 2010/08/30 09:19:38 nijtmans Exp $
+ * RCS: @(#) $Id: tclWinFile.c,v 1.109 2010/09/16 18:53:06 hobbs Exp $
*/
/* #define _WIN32_WINNT 0x0500 */
@@ -145,28 +145,6 @@ typedef struct {
WCHAR dummyBuf[MAX_PATH * 3];
} DUMMY_REPARSE_BUFFER;
-#if defined(_MSC_VER) && (_MSC_VER <= 1100)
-#undef HAVE_NO_FINDEX_ENUMS
-#define HAVE_NO_FINDEX_ENUMS
-#elif !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0400)
-#undef HAVE_NO_FINDEX_ENUMS
-#define HAVE_NO_FINDEX_ENUMS
-#endif
-
-#ifdef HAVE_NO_FINDEX_ENUMS
-/* These two aren't in VC++ 5.2 headers */
-typedef enum _FINDEX_INFO_LEVELS {
- FindExInfoStandard,
- FindExInfoMaxInfoLevel
-} FINDEX_INFO_LEVELS;
-typedef enum _FINDEX_SEARCH_OPS {
- FindExSearchNameMatch,
- FindExSearchLimitToDirectories,
- FindExSearchLimitToDevices,
- FindExSearchMaxSearchOp
-} FINDEX_SEARCH_OPS;
-#endif /* HAVE_NO_FINDEX_ENUMS */
-
/*
* Other typedefs required by this code.
*/