summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin B Kenny <kennykb@acm.org>2003-04-14 22:55:11 (GMT)
committerKevin B Kenny <kennykb@acm.org>2003-04-14 22:55:11 (GMT)
commit139312173a81a546de1011c89a4d85c3d1f4bc1b (patch)
tree874b97b2093e3037aad1fbdc27a3ea5708b53b98
parentfc8ca7b64060c121189509c2a390627088bf2f85 (diff)
downloadtcl-139312173a81a546de1011c89a4d85c3d1f4bc1b.zip
tcl-139312173a81a546de1011c89a4d85c3d1f4bc1b.tar.gz
tcl-139312173a81a546de1011c89a4d85c3d1f4bc1b.tar.bz2
Added conditionals to make tclWinFile.c compile on VC++6, which
was broken by recent changes.
-rw-r--r--ChangeLog5
-rw-r--r--win/tclWinFile.c8
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9556707..aafc58a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-14 Kevin Kenny <kennykb@acm.org>
+
+ * win/tclWinFile.c: added conditionals to restore compilation on
+ VC++6, which was broken by recent changes.
+
2003-04-14 Vince Darley <vincentdarley@users.sourceforge.net>
Merged various bug fixes from current cvs head:
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 068a029..d120742 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.44.2.2 2003/04/14 15:46:00 vincentdarley Exp $
+ * RCS: @(#) $Id: tclWinFile.c,v 1.44.2.3 2003/04/14 22:55:12 kennykb Exp $
*/
//#define _WIN32_WINNT 0x0500
@@ -128,6 +128,12 @@ typedef struct {
WCHAR dummyBuf[MAX_PATH*3];
} DUMMY_REPARSE_BUFFER;
+#if defined(_MSC_VER) && ( _MSC_VER <= 1100 )
+#define HAVE_NO_FINDEX_ENUMS
+#elif !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0400)
+#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 {