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/configure.in | |
| 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/configure.in')
| -rw-r--r-- | win/configure.in | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/win/configure.in b/win/configure.in index c88ba3d..dbc36d6 100644 --- a/win/configure.in +++ b/win/configure.in @@ -3,7 +3,7 @@ # generate the file "configure", which is run during Tcl installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.72 2003/04/03 02:24:12 mdejong Exp $ +# RCS: @(#) $Id: configure.in,v 1.73 2003/04/14 02:36:58 mdejong Exp $ AC_INIT(../generic/tcl.h) AC_PREREQ(2.57) @@ -259,6 +259,29 @@ if test "$tcl_cv_cast_to_union" = "yes"; then fi +# See if declarations like FINDEX_INFO_LEVELS are +# missing from winbase.h. This is known to be +# a problem with VC++ 5.2. + +AC_CACHE_CHECK(for FINDEX_INFO_LEVELS in winbase.h, + tcl_cv_findex_enums, +AC_TRY_COMPILE([ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#undef WIN32_LEAN_AND_MEAN +], +[ + FINDEX_INFO_LEVELS i; + FINDEX_SEARCH_OPS j; +], + tcl_cv_findex_enums=yes, + tcl_cv_findex_enums=no) +) +if test "$tcl_cv_findex_enums" = "no"; then + AC_DEFINE(HAVE_NO_FINDEX_ENUMS, 1, + [Defined when enums are missing from winbase.h]) +fi + #-------------------------------------------------------------------- # Determines the correct binary file extension (.o, .obj, .exe etc.) #-------------------------------------------------------------------- |