From 42728f947c0ced85812439b24159d5a0b75594b5 Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Mon, 3 Oct 2005 15:43:40 +0000 Subject: [PATCH] - Synch (to decrease number of diffs) --- ext/spl/spl_iterators.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ext/spl/spl_iterators.h b/ext/spl/spl_iterators.h index 4889acc290..1f4a61025e 100755 --- 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; -- 2.40.0