danog/ext-pq
1
0
Fork 0
mirror of https://github.com/danog/ext-pq.git synced 2025-01-22 22:01:33 +01:00
Code Issues Projects Releases Wiki Activity

fix zend_object_iterator.key with PHP-5.5

Browse Source
This commit is contained in:
Michael Wallner 2013-03-21 17:31:20 +01:00
parent afc8bb8eb9
commit c566b350f1
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
php_pq.c
View File

@ -479,6 +479,14 @@ static void php_pqres_iterator_current(zend_object_iterator *i, zval ***data_ptr
*data_ptr = &iter->current_val;
}
#if PHP_VERSION_ID >= 50500
static void php_pqres_iterator_key(zend_object_iterator *i, zval *key TSRMLS_DC)
{
php_pqres_iterator_t *iter = (php_pqres_iterator_t *) i;
ZVAL_LONG(key, iter->index);
}
#else
static int php_pqres_iterator_key(zend_object_iterator *i, char **key_str, uint *key_len, ulong *key_num TSRMLS_DC)
{
php_pqres_iterator_t *iter = (php_pqres_iterator_t *) i;
@ -487,6 +495,7 @@ static int php_pqres_iterator_key(zend_object_iterator *i, char **key_str, uint
return HASH_KEY_IS_LONG;
}
#endif
static void php_pqres_iterator_invalidate(zend_object_iterator *i TSRMLS_DC)
{