- Synch (to decrease number of diffs)

diff --git a/ext/spl/spl_iterators.h b/ext/spl/spl_iterators.h
index 4889acc290e033fa8297c3f75f9d833b7f5788ac..1f4a61025e272223d00e32bb65dcd0b11a0b43fc 100755 (executable)
--- a/ext/spl/spl_iterators.h
+++ b/ext/spl/spl_iterators.h
@@ -64,12 +64,14 @@ typedef enum {
 
 enum {
        /* public */
-       CIT_CALL_TOSTRING   = 1,
-       CIT_CATCH_GET_CHILD = 2,
-       CIT_PUBLIC          = CIT_CALL_TOSTRING|CIT_CATCH_GET_CHILD,
+       CIT_CALL_TOSTRING        = 0x00000001,
+       CIT_CATCH_GET_CHILD      = 0x00000002,
+       CIT_TOSTRING_USE_KEY     = 0x00000004,
+       CIT_TOSTRING_USE_CURRENT = 0x00000008,
+       CIT_PUBLIC               = 0x0000FFFF,
        /* private */
-       CIT_VALID           = 4,
-       CIT_HAS_CHILDREN    = 8
+       CIT_VALID                = 0x00010000,
+       CIT_HAS_CHILDREN         = 0x00020000
 };
 
 typedef struct _spl_dual_it_object {
@@ -95,7 +97,7 @@ typedef struct _spl_dual_it_object {
                        long             count;
                } limit;
                struct {
-                       int              flags; /* CIT_VALID, CIT_CALL_TOSTRING, CIT_CATCH_GET_CHILD */
+                       int              flags; /* CIT_* */
                        zval             *zstr;
                        zval             *zchildren;
                } caching;