summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-08-15 13:46:34 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-08-15 13:46:34 (GMT)
commitfd1dbc086751dff48dbbbd4012e5f5ac0f46b06f (patch)
tree42cd5987cfd935b78f4d0ea5297658a6801eb248
parent092dd70e63fd7c5fcc9526b06c1242322378d492 (diff)
downloadtcl-fd1dbc086751dff48dbbbd4012e5f5ac0f46b06f.zip
tcl-fd1dbc086751dff48dbbbd4012e5f5ac0f46b06f.tar.gz
tcl-fd1dbc086751dff48dbbbd4012e5f5ac0f46b06f.tar.bz2
[Bug 3388350] mingw64 compiler warnings.
Reverse the detection of struct _stat32i64, otherwise when mingw doesn't have it, tclTest.c cannot be compiled
-rw-r--r--ChangeLog1
-rwxr-xr-xwin/configure10
-rw-r--r--win/configure.in10
-rw-r--r--win/tclWinPort.h2
4 files changed, 12 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 06075bd..6237d99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2011-08-15 Jan Nijtmans <nijtmans@users.sf.net>
* win/tcl.m4: [Bug 3388350] mingw64 compiler warnings
+ * win/configure.in
* win/configure
* win/tclMtherr.c
* win/tclWinPort.h
diff --git a/win/configure b/win/configure
index 06c3dfe..1fe4dde 100755
--- a/win/configure
+++ b/win/configure
@@ -1265,8 +1265,8 @@ fi
# Check to see if struct _stat32i64 exists in mingw's sys/stat.h
-echo $ac_n "checking struct _stat32i64""... $ac_c" 1>&6
-echo "configure:1270: checking struct _stat32i64" >&5
+echo $ac_n "checking if struct _stat32i64 missing""... $ac_c" 1>&6
+echo "configure:1270: checking if struct _stat32i64 missing" >&5
if eval "test \"`echo '$''{'tcl_struct_stat32i64'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1285,12 +1285,12 @@ int main() {
EOF
if { (eval echo configure:1287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- tcl_struct_stat32i64=yes
+ tcl_struct_stat32i64=no
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- tcl_struct_stat32i64=no
+ tcl_struct_stat32i64=yes
fi
rm -f conftest*
@@ -1299,7 +1299,7 @@ fi
echo "$ac_t""$tcl_struct_stat32i64" 1>&6
if test "$tcl_struct_stat32i64" = "yes" ; then
cat >> confdefs.h <<\EOF
-#define HAVE_STRUCT_STAT32I64 1
+#define HAVE_NO_STRUCT_STAT32I64 1
EOF
fi
diff --git a/win/configure.in b/win/configure.in
index 378ca5b..47b6a4f 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -242,7 +242,7 @@ fi
# Check to see if struct _stat32i64 exists in mingw's sys/stat.h
-AC_CACHE_CHECK(struct _stat32i64,
+AC_CACHE_CHECK(if struct _stat32i64 missing,
tcl_struct_stat32i64,
AC_TRY_COMPILE([
#include <sys/types.h>
@@ -251,12 +251,12 @@ AC_TRY_COMPILE([
[
struct _stat32i64 foo;
],
- tcl_struct_stat32i64=yes,
- tcl_struct_stat32i64=no)
+ tcl_struct_stat32i64=no,
+ tcl_struct_stat32i64=yes)
)
if test "$tcl_struct_stat32i64" = "yes" ; then
- AC_DEFINE(HAVE_STRUCT_STAT32I64, 1,
- [Defined when sys/stat.h has struct_stat32i64])
+ AC_DEFINE(HAVE_NO_STRUCT_STAT32I64, 1,
+ [Defined when sys/stat.h is missing struct _stat32i64])
fi
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index be5058c..f14e1a9 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -97,7 +97,7 @@
/*
* Not all mingw32 versions have this struct.
*/
-#if !defined(__BORLANDC__) && !defined(_MSC_VER) && !defined(_WIN64) && !defined(HAVE_STRUCT_STAT32I64) && defined(BUILD_tcl)
+#if !defined(__BORLANDC__) && !defined(_MSC_VER) && !defined(_WIN64) && defined(HAVE_NO_STRUCT_STAT32I64)
struct _stat32i64 {
dev_t st_dev;
ino_t st_ino;