From: Derick Rethans Date: Thu, 18 Nov 2010 11:24:59 +0000 (+0000) Subject: - Revert the ABI changing commit. X-Git-Tag: php-5.3.4RC1~8 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2434bb66cc46ea7481f763084a7a1475ef78de6;p=php - Revert the ABI changing commit. --- diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 83996b1676..df31cd5f2a 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -1203,13 +1203,14 @@ PHPAPI char *php_format_date(char *format, int format_len, time_t ts, int localt /* {{{ php_idate */ -PHPAPI int php_idate(char format, time_t ts, int localtime TSRMLS_DC) +PHPAPI int php_idate(char format, time_t ts, int localtime) { timelib_time *t; timelib_tzinfo *tzi; int retval = -1; timelib_time_offset *offset = NULL; timelib_sll isoweek, isoyear; + TSRMLS_FETCH() t = timelib_time_ctor(); diff --git a/ext/date/php_date.h b/ext/date/php_date.h index cf7acada4d..09755060c2 100644 --- a/ext/date/php_date.h +++ b/ext/date/php_date.h @@ -163,7 +163,7 @@ ZEND_END_MODULE_GLOBALS(date) /* Backwards compability wrapper */ PHPAPI signed long php_parse_date(char *string, signed long *now); PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt); -PHPAPI int php_idate(char format, time_t ts, int localtime TSRMLS_DC); +PHPAPI int php_idate(char format, time_t ts, int localtime); #if HAVE_STRFTIME #define _php_strftime php_strftime PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gm);