- MFH move zend_object_Value definition to zend_types.h

diff --git a/Zend/zend.h b/Zend/zend.h
index c6da330287e89873fd80458e5e24574953a0bd50..da87e9946db4da8d322df5ac28e2f074fa330d52 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -279,16 +279,8 @@ typedef struct _zend_object {
        HashTable *guards; /* protects from __get/__set ... recursion */
 } zend_object;
 
-typedef unsigned int zend_object_handle;
-typedef        struct _zend_object_value zend_object_value;
-
 #include "zend_object_handlers.h"
 
-struct _zend_object_value {
-       zend_object_handle handle;
-       zend_object_handlers *handlers;
-};
-
 typedef union _zvalue_value {
        long lval;                                      /* long value */
        double dval;                            /* double value */

diff --git a/Zend/zend_object_handlers.h b/Zend/zend_object_handlers.h
index 5399e2effc2a6fff67944b0ecea53125956913e8..63caf89256eba7afc10afc041ba6f1854bf18cfc 100644 (file)
--- a/Zend/zend_object_handlers.h
+++ b/Zend/zend_object_handlers.h
@@ -103,7 +103,7 @@ typedef int (*zend_object_cast_t)(zval *readobj, zval *writeobj, int type, int s
  * Returns FAILURE if the object does not have any sense of overloaded dimensions */
 typedef int (*zend_object_count_elements_t)(zval *object, long *count TSRMLS_DC);
 
-typedef struct _zend_object_handlers {
+struct _zend_object_handlers {
        /* general object functions */
        zend_object_add_ref_t                                   add_ref;
        zend_object_del_ref_t                                   del_ref;
@@ -129,9 +129,10 @@ typedef struct _zend_object_handlers {
        zend_object_compare_t                                   compare_objects;
        zend_object_cast_t                                              cast_object;
        zend_object_count_elements_t                    count_elements;
-} zend_object_handlers;
+};
 
 extern ZEND_API zend_object_handlers std_object_handlers;
+
 BEGIN_EXTERN_C()
 ZEND_API union _zend_function *zend_std_get_static_method(zend_class_entry *ce, char *function_name_strval, int function_name_strlen TSRMLS_DC);
 ZEND_API zval **zend_std_get_static_property(zend_class_entry *ce, char *property_name, int property_name_len, zend_bool silent TSRMLS_DC);

diff --git a/Zend/zend_types.h b/Zend/zend_types.h
index a02a49de6ccca9a74324f7faf01927b6ffdf58ba..afcdd90524c342791b959b98d53de3fa9cbf3b4e 100644 (file)
--- a/Zend/zend_types.h
+++ b/Zend/zend_types.h
@@ -28,6 +28,14 @@ typedef unsigned int zend_uint;
 typedef unsigned long zend_ulong;
 typedef unsigned short zend_ushort;
 
+typedef unsigned int zend_object_handle;
+typedef struct _zend_object_handlers zend_object_handlers;
+
+typedef struct _zend_object_value {
+       zend_object_handle handle;
+       zend_object_handlers *handlers;
+} zend_object_value;
+
 #endif /* ZEND_TYPES_H */
 
 /*