summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>1999-07-27 17:30:45 +0000
committerAndi Gutmans <andi@php.net>1999-07-27 17:30:45 +0000
commit71ffa09f411c7e33bd431b4e79cfbc743c99fde1 (patch)
treebf2ab19e5b6fff070bcd619dc3fd37756d5c7922
parent88322d2ea018cdc92300833c62cc1e4c78092bb4 (diff)
downloadphp-git-71ffa09f411c7e33bd431b4e79cfbc743c99fde1.tar.gz
- strttotime is compiled in on win32 again.
-rw-r--r--ext/standard/basic_functions.c2
-rw-r--r--ext/standard/datetime.c6
2 files changed, 2 insertions, 6 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index e80cfecced..0cef5c0eac 100644
--- 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 6ad11f78ad..8598a1a4fc 100644
--- 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
+
/* }}} */
/*