cvs: /php4/ext/standard basic_functions.c datetime.c
| From: | Andi Gutmans | Date: | Tue, 27 Jul 1999 17:31:16 +0000 |
| Subject: | cvs: /php4/ext/standard basic_functions.c datetime.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-2853@lists.php.net to get a copy of this message | ||
andi Tue Jul 27 13:31:16 1999 EDT
Modified files:
/php4/ext/standard basic_functions.c datetime.c
Log:
- strttotime is compiled in on win32 again.
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.58 php4/ext/standard/basic_functions.c:1.59
--- php4/ext/standard/basic_functions.c:1.58 Tue Jul 27 12:26:30 1999
+++ php4/ext/standard/basic_functions.c Tue Jul 27 13:30:45 1999
@@ -94,9 +94,7 @@
#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)
Index: php4/ext/standard/datetime.c
diff -u php4/ext/standard/datetime.c:1.16 php4/ext/standard/datetime.c:1.17
--- php4/ext/standard/datetime.c:1.16 Mon Jul 26 12:54:41 1999
+++ php4/ext/standard/datetime.c Tue Jul 27 13:30:45 1999
@@ -19,7 +19,7 @@
*/
-/* $Id: datetime.c,v 1.16 1999/07/26 16:54:41 andi Exp $ */
+/* $Id: datetime.c,v 1.17 1999/07/27 17:30:45 andi Exp $ */
#include "php.h"
@@ -65,9 +65,8 @@
#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 @@
}
#endif
-#if !(WIN32|WINNT)
/* {{{ proto int strtotime(string time, int now) */
PHP_FUNCTION(strtotime)
{
@@ -582,7 +580,7 @@
RETURN_LONG(parsedate(timep->value.str.val, NULL));
}
}
-#endif
+
/* }}} */
/*