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 /Zend/zend_iterators.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 'Zend/zend_iterators.h')
| -rw-r--r-- | Zend/zend_iterators.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Zend/zend_iterators.h b/Zend/zend_iterators.h index a1148db214..39dbc7b163 100644 --- a/Zend/zend_iterators.h +++ b/Zend/zend_iterators.h @@ -30,28 +30,28 @@ typedef struct _zend_object_iterator zend_object_iterator; typedef struct _zend_object_iterator_funcs { /* release all resources associated with this iterator instance */ - void (*dtor)(zend_object_iterator *iter TSRMLS_DC); + void (*dtor)(zend_object_iterator *iter); /* check for end of iteration (FAILURE or SUCCESS if data is valid) */ - int (*valid)(zend_object_iterator *iter TSRMLS_DC); + int (*valid)(zend_object_iterator *iter); /* fetch the item data for the current element */ - zval *(*get_current_data)(zend_object_iterator *iter TSRMLS_DC); + zval *(*get_current_data)(zend_object_iterator *iter); /* fetch the key for the current element (optional, may be NULL). The key * should be written into the provided zval* using the ZVAL_* macros. If * this handler is not provided auto-incrementing integer keys will be * used. */ - void (*get_current_key)(zend_object_iterator *iter, zval *key TSRMLS_DC); + void (*get_current_key)(zend_object_iterator *iter, zval *key); /* step forwards to next element */ - void (*move_forward)(zend_object_iterator *iter TSRMLS_DC); + void (*move_forward)(zend_object_iterator *iter); /* rewind to start of data (optional, may be NULL) */ - void (*rewind)(zend_object_iterator *iter TSRMLS_DC); + void (*rewind)(zend_object_iterator *iter); /* invalidate current value/key (optional, may be NULL) */ - void (*invalidate_current)(zend_object_iterator *iter TSRMLS_DC); + void (*invalidate_current)(zend_object_iterator *iter); } zend_object_iterator_funcs; struct _zend_object_iterator { @@ -73,13 +73,13 @@ typedef struct _zend_class_iterator_funcs { BEGIN_EXTERN_C() /* given a zval, returns stuff that can be used to iterate it. */ -ZEND_API zend_object_iterator* zend_iterator_unwrap(zval *array_ptr TSRMLS_DC); +ZEND_API zend_object_iterator* zend_iterator_unwrap(zval *array_ptr); /* given an iterator, wrap it up as a zval for use by the engine opcodes */ -ZEND_API void zend_iterator_init(zend_object_iterator *iter TSRMLS_DC); -ZEND_API void zend_iterator_dtor(zend_object_iterator *iter TSRMLS_DC); +ZEND_API void zend_iterator_init(zend_object_iterator *iter); +ZEND_API void zend_iterator_dtor(zend_object_iterator *iter); -ZEND_API void zend_register_iterator_wrapper(TSRMLS_D); +ZEND_API void zend_register_iterator_wrapper(void); END_EXTERN_C() /* |