sniper Sun Dec 25 16:04:15 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/spl spl_iterators.c
Log:
MFH
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.15&r2=1.73.2.16&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.15
php-src/ext/spl/spl_iterators.c:1.73.2.16
--- php-src/ext/spl/spl_iterators.c:1.73.2.15 Thu Dec 22 00:37:07 2005
+++ php-src/ext/spl/spl_iterators.c Sun Dec 25 16:04:15 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.73.2.15 2005/12/22 00:37:07 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.16 2005/12/25 16:04:15 sniper Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -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;
@@ -817,9 +815,9 @@
}
#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;
@@ -956,14 +954,14 @@
}
} /* }}} */
-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);
@@ -988,7 +986,7 @@
}
}
-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;
@@ -997,13 +995,13 @@
}
}
-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;
@@ -1023,7 +1021,7 @@
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);
@@ -1120,7 +1118,7 @@
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;
@@ -1139,13 +1137,13 @@
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);
@@ -1240,7 +1238,7 @@
} /* }}} */
/* {{{ 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;
@@ -1326,7 +1324,7 @@
{NULL, NULL, NULL}
};
-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) {
@@ -1336,7 +1334,7 @@
}
}
-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;
@@ -1478,17 +1476,17 @@
{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;
@@ -1560,7 +1558,7 @@
}
}
-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);
spl_caching_it_next(intern TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
