From 2f2f93bfb6e0991467a287c1f4a3e0c13b227ef1 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 15 Jan 2008 16:32:59 -0800
Subject: [PATCH] Fix problem with getdate on mingw32 reported by Simon
 Josefsson

in <http://lists.gnu.org/archive/html/bug-gnulib/2008-01/msg00192.html>.
* lib/getdate.y (get_date): Check "HAVE_DECL_TZNAME", not "defined
tzname", when deciding whether to declare tzname.
* lib/strftime.c (tzname): Likewise.
---
 ChangeLog      | 8 ++++++++
 lib/getdate.y  | 2 +-
 lib/strftime.c | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a457d34721..77b5eda30c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix problem with getdate on mingw32 reported by Simon Josefsson
+	in <http://lists.gnu.org/archive/html/bug-gnulib/2008-01/msg00192.html>.
+	* lib/getdate.y (get_date): Check "HAVE_DECL_TZNAME", not "defined
+	tzname", when deciding whether to declare tzname.
+	* lib/strftime.c (tzname): Likewise.
+
 2008-01-15  Bruno Haible  <bruno@clisp.org>
 
 	Work around a MacOS X 10.5 bug in frexpl().
diff --git a/lib/getdate.y b/lib/getdate.y
index 1ed914f31c..1deec5160d 100644
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -1321,7 +1321,7 @@ get_date (struct timespec *result, char const *p, struct timespec const *now)
 #else
 #if HAVE_TZNAME
   {
-# ifndef tzname
+# if !HAVE_DECL_TZNAME
     extern char *tzname[];
 # endif
     int i;
diff --git a/lib/strftime.c b/lib/strftime.c
index c6a9c8040d..897aab71e5 100644
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -37,7 +37,7 @@
 #include <ctype.h>
 #include <time.h>
 
-#if HAVE_TZNAME && ! defined tzname
+#if HAVE_TZNAME && !HAVE_DECL_TZNAME
 extern char *tzname[];
 #endif
 
-- 
2.30.2