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/common/common_enum.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/common/common_enum.h')
| -rw-r--r-- | ext/intl/common/common_enum.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/intl/common/common_enum.h b/ext/intl/common/common_enum.h index af46a47751..b9b87c17e0 100644 --- a/ext/intl/common/common_enum.h +++ b/ext/intl/common/common_enum.h @@ -43,7 +43,7 @@ extern "C" { object = getThis(); \ INTLITERATOR_METHOD_FETCH_OBJECT_NO_CHECK; \ if (ii->iterator == NULL) { \ - intl_errors_set(&ii->err, U_ILLEGAL_ARGUMENT_ERROR, "Found unconstructed IntlIterator", 0 TSRMLS_CC); \ + intl_errors_set(&ii->err, U_ILLEGAL_ARGUMENT_ERROR, "Found unconstructed IntlIterator", 0); \ RETURN_FALSE; \ } @@ -63,21 +63,21 @@ typedef struct { zend_object_iterator zoi; zval current; zval wrapping_obj; - void (*destroy_it)(zend_object_iterator *iterator TSRMLS_DC); + void (*destroy_it)(zend_object_iterator *iterator); } zoi_with_current; extern zend_class_entry *IntlIterator_ce_ptr; extern zend_object_handlers IntlIterator_handlers; -U_CFUNC void zoi_with_current_dtor(zend_object_iterator *iter TSRMLS_DC); -U_CFUNC int zoi_with_current_valid(zend_object_iterator *iter TSRMLS_DC); -U_CFUNC zval *zoi_with_current_get_current_data(zend_object_iterator *iter TSRMLS_DC); -U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter TSRMLS_DC); +U_CFUNC void zoi_with_current_dtor(zend_object_iterator *iter); +U_CFUNC int zoi_with_current_valid(zend_object_iterator *iter); +U_CFUNC zval *zoi_with_current_get_current_data(zend_object_iterator *iter); +U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter); #ifdef __cplusplus -U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *object TSRMLS_DC); +U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *object); #endif -U_CFUNC void intl_register_IntlIterator_class(TSRMLS_D); +U_CFUNC void intl_register_IntlIterator_class(void); #endif // INTL_COMMON_ENUM_H |