summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2013-06-13 08:31:24 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2013-06-13 08:31:24 (GMT)
commit48205fa50d89d6296ea6397e17bfe7f5c7235bdf (patch)
tree60c375f9c8ab25e09c77fd5b3de30c7534336e9e /win
parent9fb06ec1c981ed49d2dcba71378f5e1db966e1bf (diff)
parenta831b299f7e16bcbdffc042f9a2060876e1f7e3f (diff)
downloadtcl-48205fa50d89d6296ea6397e17bfe7f5c7235bdf.zip
tcl-48205fa50d89d6296ea6397e17bfe7f5c7235bdf.tar.gz
tcl-48205fa50d89d6296ea6397e17bfe7f5c7235bdf.tar.bz2
merge trunk
Diffstat (limited to 'win')
-rw-r--r--win/Makefile.in2
-rwxr-xr-xwin/configure12
-rw-r--r--win/configure.in6
-rw-r--r--win/tclWinFile.c2
-rw-r--r--win/tclWinPort.h9
5 files changed, 25 insertions, 6 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index dc54d59..0e17ac6 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -459,7 +459,7 @@ ${TEST_DLL_FILE}: ${TCLTEST_OBJS} ${TCL_STUB_LIB_FILE}
# use pre-built zlib1.dll
${ZLIB_DLL_FILE}: ${TCL_STUB_LIB_FILE}
- @if test "@ZLIB_LIBS@set" == "${ZLIB_DIR}/win64/zdll.libset" ; then \
+ @if test "@ZLIB_LIBS@set" != "${ZLIB_DIR}/win32/zdll.libset" ; then \
$(COPY) $(ZLIB_DIR)/win64/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \
else \
$(COPY) $(ZLIB_DIR)/win32/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \
diff --git a/win/configure b/win/configure
index bad344c..fc453f8 100755
--- a/win/configure
+++ b/win/configure
@@ -4362,7 +4362,17 @@ if test "$tcl_ok" = "yes"; then
if test "$do64bit" = "yes"; then
- ZLIB_LIBS=\${ZLIB_DIR}/win64/zdll.lib
+ if test "$GCC" == "yes"; then
+
+ ZLIB_LIBS=\${ZLIB_DIR}/win64/libz.dll.a
+
+
+else
+
+ ZLIB_LIBS=\${ZLIB_DIR}/win64/zdll.lib
+
+
+fi
else
diff --git a/win/configure.in b/win/configure.in
index 574fce2..373cfcc 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -129,7 +129,11 @@ AS_IF([test "${enable_shared+set}" = "set"], [
AS_IF([test "$tcl_ok" = "yes"], [
AC_SUBST(ZLIB_DLL_FILE,[\${ZLIB_DLL_FILE}])
AS_IF([test "$do64bit" = "yes"], [
- AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win64/zdll.lib])
+ AS_IF([test "$GCC" == "yes"],[
+ AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win64/libz.dll.a])
+ ], [
+ AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win64/zdll.lib])
+ ])
], [
AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win32/zdll.lib])
])
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 8e517d1..1d9f93a 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -799,7 +799,7 @@ tclWinDebugPanic(
WCHAR msgString[TCL_MAX_WARN_LEN];
va_start(argList, format);
- _vsnprintf(buf, sizeof(buf), format, argList);
+ vsnprintf(buf, sizeof(buf), format, argList);
msgString[TCL_MAX_WARN_LEN-1] = L'\0';
MultiByteToWideChar(CP_UTF8, 0, buf, -1, msgString, TCL_MAX_WARN_LEN);
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index 457c838..ca35f38 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -468,8 +468,13 @@ typedef DWORD_PTR * PDWORD_PTR;
* including the *printf family and others. Tell it to shut up.
* (_MSC_VER is 1200 for VC6, 1300 or 1310 for vc7.net, 1400 for 8.0)
*/
-#if _MSC_VER >= 1400
-#pragma warning(disable:4996)
+#if defined(_MSC_VER)
+# if _MSC_VER >= 1400
+# pragma warning(disable:4244)
+# pragma warning(disable:4267)
+# pragma warning(disable:4996)
+# endif
+# define vsnprintf _vsnprintf
#endif