- Remove wrong inline usage (and fix bug #35796)

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 764194645adcb8ff9d697ff5c4003a171f6320d8..90026fdd05c8450dbc73ffe9bc291daa75dc2960 100755 (executable)
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -36,8 +36,6 @@
 #include "spl_array.h"
 #include "spl_exceptions.h"
 
-#define INLINE inline
-
 PHPAPI zend_class_entry *spl_ce_RecursiveIterator;
 PHPAPI zend_class_entry *spl_ce_RecursiveIteratorIterator;
 PHPAPI zend_class_entry *spl_ce_FilterIterator;
@@ -831,9 +829,9 @@ int spl_dual_it_call_method(char *method, INTERNAL_FUNCTION_PARAMETERS)
 }
 #endif
 
-static INLINE int spl_dual_it_fetch(spl_dual_it_object *intern, int check_more TSRMLS_DC);
+static inline int spl_dual_it_fetch(spl_dual_it_object *intern, int check_more TSRMLS_DC);
 
-static INLINE spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS, zend_class_entry *ce_inner, dual_it_type dit_type)
+static inline spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS, zend_class_entry *ce_inner, dual_it_type dit_type)
 {
        zval                 *zobject, *retval;
        spl_dual_it_object   *intern;
@@ -990,14 +988,14 @@ SPL_METHOD(dual_it, getInnerIterator)
        }
 } /* }}} */
 
-static INLINE void spl_dual_it_require(spl_dual_it_object *intern TSRMLS_DC)
+static inline void spl_dual_it_require(spl_dual_it_object *intern TSRMLS_DC)
 {
        if (!intern->inner.iterator) {
                php_error_docref(NULL TSRMLS_CC, E_ERROR, "The inner constructor wasn't initialized with an iterator instance");
        }
 }
 
-static INLINE void spl_dual_it_free(spl_dual_it_object *intern TSRMLS_DC)
+static inline void spl_dual_it_free(spl_dual_it_object *intern TSRMLS_DC)
 {
        if (intern->inner.iterator && intern->inner.iterator->funcs->invalidate_current) {
                intern->inner.iterator->funcs->invalidate_current(intern->inner.iterator TSRMLS_CC);
@@ -1022,7 +1020,7 @@ static INLINE void spl_dual_it_free(spl_dual_it_object *intern TSRMLS_DC)
        }
 }
 
-static INLINE void spl_dual_it_rewind(spl_dual_it_object *intern TSRMLS_DC)
+static inline void spl_dual_it_rewind(spl_dual_it_object *intern TSRMLS_DC)
 {
        spl_dual_it_free(intern TSRMLS_CC);
        intern->current.pos = 0;
@@ -1031,13 +1029,13 @@ static INLINE void spl_dual_it_rewind(spl_dual_it_object *intern TSRMLS_DC)
        }
 }
 
-static INLINE int spl_dual_it_valid(spl_dual_it_object *intern TSRMLS_DC)
+static inline int spl_dual_it_valid(spl_dual_it_object *intern TSRMLS_DC)
 {
        /* FAILURE / SUCCESS */
        return intern->inner.iterator->funcs->valid(intern->inner.iterator TSRMLS_CC);
 }
 
-static INLINE int spl_dual_it_fetch(spl_dual_it_object *intern, int check_more TSRMLS_DC)
+static inline int spl_dual_it_fetch(spl_dual_it_object *intern, int check_more TSRMLS_DC)
 {
        zval **data;
 
@@ -1057,7 +1055,7 @@ static INLINE int spl_dual_it_fetch(spl_dual_it_object *intern, int check_more T
        return FAILURE;
 }
 
-static INLINE void spl_dual_it_next(spl_dual_it_object *intern, int do_free TSRMLS_DC)
+static inline void spl_dual_it_next(spl_dual_it_object *intern, int do_free TSRMLS_DC)
 {
        if (do_free) {
                spl_dual_it_free(intern TSRMLS_CC);
@@ -1158,7 +1156,7 @@ SPL_METHOD(dual_it, next)
        spl_dual_it_fetch(intern, 1 TSRMLS_CC);
 } /* }}} */
 
-static INLINE void spl_filter_it_fetch(zval *zthis, spl_dual_it_object *intern TSRMLS_DC)
+static inline void spl_filter_it_fetch(zval *zthis, spl_dual_it_object *intern TSRMLS_DC)
 {
        zval *retval;
 
@@ -1177,13 +1175,13 @@ static INLINE void spl_filter_it_fetch(zval *zthis, spl_dual_it_object *intern T
        spl_dual_it_free(intern TSRMLS_CC);
 }
 
-static INLINE void spl_filter_it_rewind(zval *zthis, spl_dual_it_object *intern TSRMLS_DC)
+static inline void spl_filter_it_rewind(zval *zthis, spl_dual_it_object *intern TSRMLS_DC)
 {
        spl_dual_it_rewind(intern TSRMLS_CC);
        spl_filter_it_fetch(zthis, intern TSRMLS_CC);
 }
 
-static INLINE void spl_filter_it_next(zval *zthis, spl_dual_it_object *intern TSRMLS_DC)
+static inline void spl_filter_it_next(zval *zthis, spl_dual_it_object *intern TSRMLS_DC)
 {
        spl_dual_it_next(intern, 1 TSRMLS_CC);
        spl_filter_it_fetch(zthis, intern TSRMLS_CC);
@@ -1336,7 +1334,7 @@ SPL_METHOD(RecursiveRegExIterator, __construct)
 #endif
 
 /* {{{ spl_dual_it_free_storage */
-static INLINE void spl_dual_it_free_storage(void *_object TSRMLS_DC)
+static inline void spl_dual_it_free_storage(void *_object TSRMLS_DC)
 {
        spl_dual_it_object        *object = (spl_dual_it_object *)_object;
 
@@ -1458,7 +1456,7 @@ static zend_function_entry spl_funcs_RecursiveRegExIterator[] = {
 };
 #endif
 
-static INLINE int spl_limit_it_valid(spl_dual_it_object *intern TSRMLS_DC)
+static inline int spl_limit_it_valid(spl_dual_it_object *intern TSRMLS_DC)
 {
        /* FAILURE / SUCCESS */
        if (intern->u.limit.count != -1 && intern->current.pos >= intern->u.limit.offset + intern->u.limit.count) {
@@ -1468,7 +1466,7 @@ static INLINE int spl_limit_it_valid(spl_dual_it_object *intern TSRMLS_DC)
        }
 }
 
-static INLINE void spl_limit_it_seek(spl_dual_it_object *intern, long pos TSRMLS_DC)
+static inline void spl_limit_it_seek(spl_dual_it_object *intern, long pos TSRMLS_DC)
 {
        zval  *zpos;
 
@@ -1610,17 +1608,17 @@ static zend_function_entry spl_funcs_LimitIterator[] = {
        {NULL, NULL, NULL}
 };
 
-static INLINE int spl_caching_it_valid(spl_dual_it_object *intern TSRMLS_DC)
+static inline int spl_caching_it_valid(spl_dual_it_object *intern TSRMLS_DC)
 {
        return intern->u.caching.flags & CIT_VALID ? SUCCESS : FAILURE;
 }
 
-static INLINE int spl_caching_it_has_next(spl_dual_it_object *intern TSRMLS_DC)
+static inline int spl_caching_it_has_next(spl_dual_it_object *intern TSRMLS_DC)
 {
        return spl_dual_it_valid(intern TSRMLS_CC);
 }
 
-static INLINE void spl_caching_it_next(spl_dual_it_object *intern TSRMLS_DC)
+static inline void spl_caching_it_next(spl_dual_it_object *intern TSRMLS_DC)
 {
        if (spl_dual_it_fetch(intern, 1 TSRMLS_CC) == SUCCESS) {
                intern->u.caching.flags |= CIT_VALID;
@@ -1678,7 +1676,7 @@ static INLINE void spl_caching_it_next(spl_dual_it_object *intern TSRMLS_DC)
        }
 }
 
-static INLINE void spl_caching_it_rewind(spl_dual_it_object *intern TSRMLS_DC)
+static inline void spl_caching_it_rewind(spl_dual_it_object *intern TSRMLS_DC)
 {
        spl_dual_it_rewind(intern TSRMLS_CC);
        zend_hash_clean(HASH_OF(intern->u.caching.zcache));

diff --git a/ext/spl/tests/array_004.phpt b/ext/spl/tests/array_004.phpt
index e7abf2b1dc853680d7642cfbf030d91ad3ee84ed..084cf849a53657565ca5ef1737bdc17937fcdcf8 100755 (executable)
--- a/ext/spl/tests/array_004.phpt
+++ b/ext/spl/tests/array_004.phpt
@@ -3,7 +3,7 @@ SPL: ArrayIterator
 --SKIPIF--
 <?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
-allow_call_time_pass_reference=1
+error_reporting=2047
 --FILE--
 <?php
 

diff --git a/ext/spl/tests/array_006.phpt b/ext/spl/tests/array_006.phpt
index 5dd9bdec7a5a76b0fd5282f042fb7ce79befcf61..274007aea432da3f8d1dcf80a21d8a35dc7b9bb9 100755 (executable)
--- a/ext/spl/tests/array_006.phpt
+++ b/ext/spl/tests/array_006.phpt
@@ -3,7 +3,7 @@ SPL: ArrayIterator without ArrayObject
 --SKIPIF--
 <?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
-allow_call_time_pass_reference=1
+error_reporting=2047
 --FILE--
 <?php
 

diff --git a/ext/spl/tests/array_008.phpt b/ext/spl/tests/array_008.phpt
index 613e3247762fcad7fa6b2390fe837aa355f941ab..883a35873dbfec247bc28cedb8e88b50d0b043eb 100755 (executable)
--- a/ext/spl/tests/array_008.phpt
+++ b/ext/spl/tests/array_008.phpt
@@ -3,7 +3,7 @@ SPL: ArrayIterator and foreach reference
 --SKIPIF--
 <?php if (!extension_loaded("spl")) print "skip"; ?>
 --INI--
-allow_call_time_pass_reference=1
+error_reporting=2047
 --FILE--
 <?php