- strttotime is compiled in on win32 again.

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index e80cfecced19a3f6035898146be71a5ed9b68722..0cef5c0eacc5aca918b33eef438a12e5ff806378 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -94,9 +94,7 @@ function_entry basic_functions[] = {
 #if HAVE_STRFTIME
        PHP_FE(strftime,                                                                NULL)
 #endif
-#if !(WIN32|WINNT)
        PHP_FE(strtotime,                                                               NULL)
-#endif
        PHP_FE(date,                                                                    NULL)
        PHP_FE(gmdate,                                                                  NULL)
        PHP_FE(getdate,                                                                 NULL)

diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index 6ad11f78ad28d026531d90e8c31b471eeecfad26..8598a1a4fcdcf00fae4267f87d54955ca9165540 100644 (file)
--- a/ext/standard/datetime.c
+++ b/ext/standard/datetime.c
@@ -65,9 +65,8 @@ static int phpday_tab[2][12] =
 
 #define isleap(year) (((year%4) == 0 && (year%100)!=0) || (year%400)==0)
 
-#if !(WIN32|WINNT)
 extern PHPAPI time_t parsedate(char *p, struct timeval *now);
-#endif
+
 
 PHP_FUNCTION(time)
 {
@@ -558,7 +557,6 @@ PHP_FUNCTION(strftime)
 }
 #endif
 
-#if !(WIN32|WINNT)
 /* {{{ proto int strtotime(string time, int now) */
 PHP_FUNCTION(strtotime)
 {
@@ -582,7 +580,7 @@ PHP_FUNCTION(strtotime)
                RETURN_LONG(parsedate(timep->value.str.val, NULL));
        }
 }
-#endif
+
 /* }}} */
 
 /*