diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rwxr-xr-x | win/configure | 4 | ||||
-rw-r--r-- | win/configure.in | 3 |
3 files changed, 9 insertions, 1 deletions
@@ -4,6 +4,9 @@ unicode cmdline" now implemented for cygwin and mingw32 too. * tests/main.test: No longer disable tests Tcl_Main-1.4 and 1.6 on Windows, because those now work on all supported platforms. + * win/configure.in: Set NO_VIZ=1 when zlib is compiled in libtcl, + this resolves compiler warnings in 64-bit and static builds. + * win/configure (regenerated) 2010-11-18 Donal K. Fellows <dkf@users.sf.net> diff --git a/win/configure b/win/configure index 4ea242c..472ad1b 100755 --- a/win/configure +++ b/win/configure @@ -4527,6 +4527,10 @@ else ZLIB_OBJS=\${ZLIB_OBJS} + cat >>confdefs.h <<_ACEOF +#define NO_VIZ 1 +_ACEOF + fi diff --git a/win/configure.in b/win/configure.in index 4690269..f36962c 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.124 2010/09/28 15:13:55 rmax Exp $ +# RCS: @(#) $Id: configure.in,v 1.125 2010/11/18 23:15:18 nijtmans Exp $ AC_INIT(../generic/tcl.h) AC_PREREQ(2.59) @@ -326,6 +326,7 @@ AS_IF([test "$tcl_ok" = "yes"], [ AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win32/zdll.lib]) ], [ AC_SUBST(ZLIB_OBJS,[\${ZLIB_OBJS}]) + AC_DEFINE_UNQUOTED(NO_VIZ, 1) ]) AC_DEFINE(HAVE_ZLIB, 1, [Is there an installed zlib?]) |