merge current trunk

3 files changed, 13 insertions, 13 deletions

diff --git a/win/configure b/win/configure
index 3a40da1..94766ff 100755
--- a/win/configure
+++ b/win/configure
@@ -3485,8 +3485,8 @@ fi
 
 # Check to see if struct _stat32i64 exists in mingw's sys/stat.h
 
-echo "$as_me:$LINENO: checking struct _stat32i64" >&5
-echo $ECHO_N "checking struct _stat32i64... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking if struct _stat32i64 missing" >&5
+echo $ECHO_N "checking if struct _stat32i64 missing... $ECHO_C" >&6
 if test "${tcl_struct_stat32i64+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -3532,12 +3532,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  tcl_struct_stat32i64=yes
+  tcl_struct_stat32i64=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-tcl_struct_stat32i64=no
+tcl_struct_stat32i64=yes
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -3547,7 +3547,7 @@ echo "${ECHO_T}$tcl_struct_stat32i64" >&6
 if test "$tcl_struct_stat32i64" = "yes" ; then
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_STAT32I64 1
+#define HAVE_NO_STRUCT_STAT32I64 1
 _ACEOF
 
 fi
diff --git a/win/configure.in b/win/configure.in
index cb958f2..a42abdc 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -227,7 +227,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>
@@ -236,12 +236,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
 
 
@@ -399,7 +399,7 @@ AC_CHECK_TYPE([intptr_t], [
     for tcl_cv_intptr_t in "int" "long" "long long" none; do
 	if test "$tcl_cv_intptr_t" != none; then
 	    AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT],
-		    [[sizeof (void *) <= sizeof ($tcl_cv_intptr_t)]])], 
+		    [[sizeof (void *) <= sizeof ($tcl_cv_intptr_t)]])],
 		[tcl_ok=yes], [tcl_ok=no])
 	    test "$tcl_ok" = yes && break; fi
     done])
@@ -415,7 +415,7 @@ AC_CHECK_TYPE([uintptr_t], [
 	    none; do
 	if test "$tcl_cv_uintptr_t" != none; then
 	    AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT],
-		    [[sizeof (void *) <= sizeof ($tcl_cv_uintptr_t)]])], 
+		    [[sizeof (void *) <= sizeof ($tcl_cv_uintptr_t)]])],
 		[tcl_ok=yes], [tcl_ok=no])
 	    test "$tcl_ok" = yes && break; fi
     done])
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index ca58470..66888b9 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -118,7 +118,7 @@
 /*
  * Not all mingw32 versions have this struct.
  */
-#if !defined(__BORLANDC__) && !defined(_MSC_VER) && !defined(_WIN64) && !defined(HAVE_STRUCT_STAT32I64)
+#if !defined(__BORLANDC__) && !defined(_MSC_VER) && !defined(_WIN64) && defined(HAVE_NO_STRUCT_STAT32I64)
   struct _stat32i64 {
     dev_t st_dev;
     ino_t st_ino;