summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2020-10-07 14:55:25 (GMT)
committerdgp <dgp@users.sourceforge.net>2020-10-07 14:55:25 (GMT)
commit5ef16060be5c925a3b494e1f9acf5847554385c3 (patch)
tree6b0fc40478fd98220267675d721fff20245b8b54
parentcd8531d2930e5f6b0363494960ec70745709e3a0 (diff)
parenta9405cc25305fbdccd97fd95a57d8f76c9eda0ac (diff)
downloadtcl-5ef16060be5c925a3b494e1f9acf5847554385c3.zip
tcl-5ef16060be5c925a3b494e1f9acf5847554385c3.tar.gz
tcl-5ef16060be5c925a3b494e1f9acf5847554385c3.tar.bz2
merge 8.6
-rwxr-xr-xunix/configure2
-rw-r--r--unix/tcl.m42
2 files changed, 2 insertions, 2 deletions
diff --git a/unix/configure b/unix/configure
index 702914b..62f017d 100755
--- a/unix/configure
+++ b/unix/configure
@@ -14030,7 +14030,7 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-struct tm tm; tm.tm_gmtoff;
+struct tm tm; (void)tm.tm_gmtoff;
;
return 0;
}
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 25a01ac..51ac8d9 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2339,7 +2339,7 @@ AC_DEFUN([SC_TIME_HANDLER], [
fi
AC_CACHE_CHECK([tm_gmtoff in struct tm], tcl_cv_member_tm_gmtoff, [
- AC_TRY_COMPILE([#include <time.h>], [struct tm tm; tm.tm_gmtoff;],
+ AC_TRY_COMPILE([#include <time.h>], [struct tm tm; (void)tm.tm_gmtoff;],
tcl_cv_member_tm_gmtoff=yes, tcl_cv_member_tm_gmtoff=no)])
if test $tcl_cv_member_tm_gmtoff = yes ; then
AC_DEFINE(HAVE_TM_GMTOFF, 1, [Should we use the tm_gmtoff field of struct tm?])