Declare timezone only, if the system fails to do so.

acconfig.h.in

@@ -1,7 +1,5 @@
 /* This is the default configuration file to read -*- C -*- */
 
-#undef socklen_t
-
 /* these are defined by automake */
 #undef PACKAGE
 #undef VERSION

acinclude.m4

@@ -484,3 +484,22 @@ AC_DEFUN(PHP_OUTPUT,[
   PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES $1"
 ])
 
+AC_DEFUN(PHP_DECLARED_TIMEZONE,[
+  AC_CACHE_CHECK(for declared timezone, ac_cv_declared_timezone,[
+    AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <time.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+],[
+    time_t foo = (time_t) timezone;
+],[
+  ac_cv_declared_timezone=yes
+],[
+  ac_cv_declared_timezone=no
+])])
+  if test "$ac_cv_declared_timezone" = "yes"; then
+    AC_DEFINE(HAVE_DECLARED_TIMEZONE, 1, [Whether system headers declare timezone])
+  fi
+])

configure.in

@@ -335,6 +335,7 @@ AC_REPLACE_FUNCS(strlcat strlcpy getopt)
 AC_FUNC_UTIME_NULL
 AC_FUNC_ALLOCA
 AC_BROKEN_SPRINTF
+PHP_DECLARED_TIMEZONE
 
 dnl AIX keeps in_addr_t in /usr/include/netinet/in.h
 dnl AC_MSG_CHECKING(for in_addr_t)

ext/standard/datetime.c

@@ -53,7 +53,7 @@ char *day_short_names[] =
 	"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
 };
 
-#if !defined(HAVE_TM_ZONE) && !defined(_TIMEZONE) && !(WIN32||WINNT)
+#if !defined(HAVE_TM_ZONE) && !defined(_TIMEZONE) && !defined(HAVE_DECLARED_TIMEZONE)
 extern time_t timezone;
 #endif
 

ext/standard/parsedate.y

@@ -46,14 +46,9 @@
 #include <alloca.h>
 #endif
 
-#if WIN32||WINNT
+#if !defined(HAVE_TM_ZONE) && !defined(_TIMEZONE) && !defined(HAVE_DECLARED_TIMEZONE)
-#	include <time.h>
-#else
-#	if !defined(HAVE_TM_ZONE) && !defined(_TIMEZONE)
 extern time_t timezone;
 #endif
-#endif
-
 
 #define yylhs		date_yylhs
 #define yylen		date_yylen

main/win95nt.h

@@ -1,4 +1,5 @@
 /* Defines and types for Windows 95/NT */
+#define HAVE_DECLARED_TIMEZONE
 #define WIN32_LEAN_AND_MEAN
 #include <io.h>
 #include <malloc.h>