diff options
Diffstat (limited to 'Zend/zend.h')
| -rw-r--r-- | Zend/zend.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index 45a9e75742..189740a915 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -258,7 +258,6 @@ void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((nore # define zend_error_noreturn zend_error #endif - /* * zval */ @@ -320,7 +319,7 @@ struct _zend_class_entry { char type; char *name; zend_uint name_length; - struct _zend_class_entry *parent; + struct _zend_class_entry *parent; int refcount; zend_bool constants_updated; zend_uint ce_flags; @@ -341,6 +340,7 @@ struct _zend_class_entry { union _zend_function *__unset; union _zend_function *__isset; union _zend_function *__call; + union _zend_function *__tostring; union _zend_function *serialize_func; union _zend_function *unserialize_func; @@ -348,7 +348,7 @@ struct _zend_class_entry { /* handlers */ zend_object_value (*create_object)(zend_class_entry *class_type TSRMLS_DC); - zend_object_iterator *(*get_iterator)(zend_class_entry *ce, zval *object TSRMLS_DC); + zend_object_iterator *(*get_iterator)(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC); int (*interface_gets_implemented)(zend_class_entry *iface, zend_class_entry *class_type TSRMLS_DC); /* a class implements this interface */ /* serializer callbacks */ @@ -363,7 +363,7 @@ struct _zend_class_entry { zend_uint line_end; char *doc_comment; zend_uint doc_comment_len; - + struct _zend_module_entry *module; }; @@ -384,7 +384,7 @@ typedef struct _zend_utility_functions { char *(*getenv_function)(char *name, size_t name_len TSRMLS_DC); } zend_utility_functions; - + typedef struct _zend_utility_values { char *import_use_extension; uint import_use_extension_length; @@ -430,7 +430,6 @@ typedef int (*zend_write_func_t)(const char *str, uint str_length); #define OE_IS_OBJECT (1<<1) #define OE_IS_METHOD (1<<2) - int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions); void zend_shutdown(TSRMLS_D); void zend_register_standard_ini_entries(TSRMLS_D); @@ -562,7 +561,7 @@ END_EXTERN_C() #define INIT_PZVAL(z) \ (z)->refcount = 1; \ - (z)->is_ref = 0; + (z)->is_ref = 0; #define INIT_ZVAL(z) z = zval_used_for_init; |