diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-08-15 13:51:21 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-08-15 13:51:21 (GMT) |
commit | 788d06fcf3f90ffe105c77b3230be4f3fc1a62bd (patch) | |
tree | e86275675b2923b5745266c49a2cb0948a7d71a6 | |
parent | ad9424f909976ade314404a44168e5c0eca6983e (diff) | |
parent | fd1dbc086751dff48dbbbd4012e5f5ac0f46b06f (diff) | |
download | tcl-788d06fcf3f90ffe105c77b3230be4f3fc1a62bd.zip tcl-788d06fcf3f90ffe105c77b3230be4f3fc1a62bd.tar.gz tcl-788d06fcf3f90ffe105c77b3230be4f3fc1a62bd.tar.bz2 |
mingw64 compiler warnings. Reverse the detection of struct _stat32i64,
otherwise when mingw doesn't have it, tclTest.c cannot be compiled
-rw-r--r-- | ChangeLog | 2 | ||||
-rwxr-xr-x | win/configure | 10 | ||||
-rw-r--r-- | win/configure.in | 14 | ||||
-rw-r--r-- | win/tclWinPort.h | 2 |
4 files changed, 15 insertions, 13 deletions
@@ -3,6 +3,8 @@ * win/tclWinPort.h: [Bug 3388350] mingw64 compiler warnings * win/tclWinPipe.c * win/tclWinSock.c + * win/configure.in + * win/configure * generic/tclPosixStr.c * generic/tclStrToD.c diff --git a/win/configure b/win/configure index 174ad68..7ff7248 100755 --- a/win/configure +++ b/win/configure @@ -3552,8 +3552,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 @@ -3599,12 +3599,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 @@ -3614,7 +3614,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 ca5ef9c..791d96a 100644 --- a/win/configure.in +++ b/win/configure.in @@ -243,7 +243,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> @@ -252,12 +252,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 @@ -345,7 +345,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]) @@ -361,7 +361,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 f29b560..6d7ffa2 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -107,7 +107,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; |