From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 22 Oct 2011 09:17:01 +0000 (+0200)
Subject: Fix bugs #641 and #9794 with %Z and current-time-zone on w32.
X-Git-Tag: emacs-pretest-24.0.91~44
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=804a4315bdae38f866623b93635c6568f66ba69e;p=emacs.git

Fix bugs #641 and #9794 with %Z and current-time-zone on w32.

 nt/config.nt (HAVE_TZNAME, HAVE_DECL_TZNAME): Define.
---

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 8c2ca056aa1..fb3a168ebfe 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-19  Eli Zaretskii  <eliz@gnu.org>
+
+	* config.nt (HAVE_TZNAME, HAVE_DECL_TZNAME): Define.
+	(Bug#9794) (Bug#641)
+
 2011-09-04  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* config.nt (HAVE_SNPRINTF): New macro.
diff --git a/nt/config.nt b/nt/config.nt
index 923143cf13e..7ab89add0fc 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -187,7 +187,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #undef TM_IN_SYS_TIME
 #undef HAVE_TM_ZONE
-#undef HAVE_TZNAME
+
+/* Define to 1 if you don't have `tm_zone' but do have the external array
+   `tzname'. */
+#define HAVE_TZNAME 1
+
+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
+   */
+#define HAVE_DECL_TZNAME 1
 
 #undef const