From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Wed, 25 Apr 2001 02:53:25 +0000 (+0000)
Subject: The tzname[] bit is not needed by util.c -- and causes
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e2465f50f6c5b07bc73c22766f9c58b92c0e8a1e;p=p5sagit%2Fp5-mst-13.2.git

The tzname[] bit is not needed by util.c -- and causes
heartburn in VMS (and it missing was probably the cause of
the Mac OS X trouble).  Ouch.

p4raw-id: //depot/perl@9830
---

diff --git a/ext/POSIX/POSIX.xs b/ext/POSIX/POSIX.xs
index fe32529..6968835 100644
--- a/ext/POSIX/POSIX.xs
+++ b/ext/POSIX/POSIX.xs
@@ -64,9 +64,14 @@
 #endif
 #include <fcntl.h>
 
-/* Mac OSX does not include a definition of tzname in a .h file */
-#if defined (HAS_TZNAME) && defined(__APPLE__) && defined(__MACH__)
-extern char *tzname[2];
+#ifdef HAS_TZNAME
+#  if !defined(WIN32) && !defined(__CYGWIN__)
+extern char *tzname[];
+#  endif
+#else
+#if !defined(WIN32) || (defined(__MINGW32__) && !defined(tzname))
+char *tzname[] = { "" , "" };
+#endif
 #endif
 
 #if defined(__VMS) && !defined(__POSIX_SOURCE)
diff --git a/util.c b/util.c
index b3f1ea1..52872a8 100644
--- a/util.c
+++ b/util.c
@@ -4126,16 +4126,6 @@ Perl_ebcdic_control(pTHX_ int ch)
 }
 #endif
 
-#ifdef HAS_TZNAME
-#  if !defined(WIN32) && !defined(__CYGWIN__)
-extern char *tzname[];
-#  endif
-#else
-#if !defined(WIN32) || (defined(__MINGW32__) && !defined(tzname))
-char *tzname[] = { "" , "" };
-#endif
-#endif
-
 /* XXX struct tm on some systems (SunOS4/BSD) contains extra (non POSIX)
  * fields for which we don't have Configure support yet:
  *   char *tm_zone;   -- abbreviation of timezone name