]> granicus.if.org Git - php/commitdiff
- Revert the ABI changing commit.
authorDerick Rethans <derick@php.net>
Thu, 18 Nov 2010 11:24:59 +0000 (11:24 +0000)
committerDerick Rethans <derick@php.net>
Thu, 18 Nov 2010 11:24:59 +0000 (11:24 +0000)
ext/date/php_date.c
ext/date/php_date.h

index 83996b167679fa5f7259616441971f39d4d513b8..df31cd5f2a73c31d3d04331d01d6aa3c25277802 100644 (file)
@@ -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();
 
index cf7acada4d65a88ac81949a8b0553ad3362aeb02..09755060c2c9216aecd1f1eee6cebf89bc325a7f 100644 (file)
@@ -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);