Mercurial > emacs

changeset 111275:393b44bc9757

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* configure.in (checking whether localtime caches TZ): Use unsetenv instead of modifying environment directly.
author Ken Brown <kbrown@cornell.edu>
date Sun, 31 Oct 2010 19:21:53 -0400
parents f746433112ea
children 23bef14261e1
files ChangeLog configure configure.in
diffstat 3 files changed, 9 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Oct 31 15:55:44 2010 -0700
+++ b/ChangeLog	Sun Oct 31 19:21:53 2010 -0400
@@ -1,3 +1,8 @@
+2010-10-31  Ken Brown  <kbrown@cornell.edu>
+
+	* configure.in (checking whether localtime caches TZ): Use
+	unsetenv instead of modifying environment directly.
+
 2010-10-25  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* configure.in (checking for -znocombreloc): Use AC_LANG_PROGRAM
--- a/configure	Sun Oct 31 15:55:44 2010 -0700
+++ b/configure	Sun Oct 31 19:21:53 2010 -0400
@@ -13982,14 +13982,6 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
-extern char **environ;
-unset_TZ ()
-{
-  char **from, **to;
-  for (to = from = environ; (*to = *from); from++)
-    if (! (to[0][0] == 'T' && to[0][1] == 'Z' && to[0][2] == '='))
-      to++;
-}
 char TZ_GMT0[] = "TZ=GMT0";
 char TZ_PST8[] = "TZ=PST8";
 main()
@@ -13999,13 +13991,13 @@
   if (putenv (TZ_GMT0) != 0)
     exit (1);
   hour_GMT0 = localtime (&now)->tm_hour;
-  unset_TZ ();
+  unsetenv("TZ");
   hour_unset = localtime (&now)->tm_hour;
   if (putenv (TZ_PST8) != 0)
     exit (1);
   if (localtime (&now)->tm_hour == hour_GMT0)
     exit (1);
-  unset_TZ ();
+  unsetenv("TZ");
   if (localtime (&now)->tm_hour != hour_unset)
     exit (1);
   exit (0);
--- a/configure.in	Sun Oct 31 15:55:44 2010 -0700
+++ b/configure.in	Sun Oct 31 19:21:53 2010 -0400
@@ -2952,14 +2952,6 @@
 AC_CACHE_VAL(emacs_cv_localtime_cache,
 [if test x$ac_cv_func_tzset = xyes; then
 AC_TRY_RUN([#include <time.h>
-extern char **environ;
-unset_TZ ()
-{
-  char **from, **to;
-  for (to = from = environ; (*to = *from); from++)
-    if (! (to[0][0] == 'T' && to[0][1] == 'Z' && to[0][2] == '='))
-      to++;
-}
 char TZ_GMT0[] = "TZ=GMT0";
 char TZ_PST8[] = "TZ=PST8";
 main()
@@ -2969,13 +2961,13 @@
   if (putenv (TZ_GMT0) != 0)
     exit (1);
   hour_GMT0 = localtime (&now)->tm_hour;
-  unset_TZ ();
+  unsetenv("TZ");
   hour_unset = localtime (&now)->tm_hour;
   if (putenv (TZ_PST8) != 0)
     exit (1);
   if (localtime (&now)->tm_hour == hour_GMT0)
     exit (1);
-  unset_TZ ();
+  unsetenv("TZ");
   if (localtime (&now)->tm_hour != hour_unset)
     exit (1);
   exit (0);