diff options
author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /ext/intl/timezone/timezone_class.h | |
parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
download | php-git-POST_NATIVE_TLS_MERGE.tar.gz |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'ext/intl/timezone/timezone_class.h')
-rw-r--r-- | ext/intl/timezone/timezone_class.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/intl/timezone/timezone_class.h b/ext/intl/timezone/timezone_class.h index 94b781b332..0667c78994 100644 --- a/ext/intl/timezone/timezone_class.h +++ b/ext/intl/timezone/timezone_class.h @@ -60,16 +60,16 @@ static inline TimeZone_object *php_intl_timezone_fetch_object(zend_object *obj) #define TIMEZONE_METHOD_FETCH_OBJECT\ TIMEZONE_METHOD_FETCH_OBJECT_NO_CHECK; \ if (to->utimezone == NULL) { \ - intl_errors_set(&to->err, U_ILLEGAL_ARGUMENT_ERROR, "Found unconstructed IntlTimeZone", 0 TSRMLS_CC); \ + intl_errors_set(&to->err, U_ILLEGAL_ARGUMENT_ERROR, "Found unconstructed IntlTimeZone", 0); \ RETURN_FALSE; \ } -zval *timezone_convert_to_datetimezone(const TimeZone *timeZone, intl_error *outside_error, const char *func, zval *ret TSRMLS_DC); -TimeZone *timezone_process_timezone_argument(zval *zv_timezone, intl_error *error, const char *func TSRMLS_DC); +zval *timezone_convert_to_datetimezone(const TimeZone *timeZone, intl_error *outside_error, const char *func, zval *ret); +TimeZone *timezone_process_timezone_argument(zval *zv_timezone, intl_error *error, const char *func); -void timezone_object_construct(const TimeZone *zone, zval *object, int owned TSRMLS_DC); +void timezone_object_construct(const TimeZone *zone, zval *object, int owned); -void timezone_register_IntlTimeZone_class(TSRMLS_D); +void timezone_register_IntlTimeZone_class(void); extern zend_class_entry *TimeZone_ce_ptr; extern zend_object_handlers TimeZone_handlers; |