]> granicus.if.org Git - php/commitdiff
- Move zend_object_value definition to zend_type.h
authorMarcus Boerger <helly@php.net>
Tue, 20 Dec 2005 21:35:17 +0000 (21:35 +0000)
committerMarcus Boerger <helly@php.net>
Tue, 20 Dec 2005 21:35:17 +0000 (21:35 +0000)
# Types declared there can be used in configure stuff already. zend.h is
# being created by configure...

Zend/zend.h
Zend/zend_object_handlers.h
Zend/zend_types.h

index 9c14ca0beca02b45ab329a730a89e930deb1e1b7..d8432784b7dfa4dbfbe2929af38f70f9d0974f2b 100644 (file)
@@ -283,16 +283,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 */
index 017874ba4020e01a2d713a183ae2d40ed0c7e68b..bf1d3c3508ae2f5e6f0332436c9592407d873237 100644 (file)
@@ -106,7 +106,7 @@ typedef int (*zend_object_cast_t)(zval *readobj, zval *retval, int type TSRMLS_D
  * 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;
@@ -132,9 +132,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, zend_uchar type, void *property_name, int property_name_len, zend_bool silent TSRMLS_DC);
index a02a49de6ccca9a74324f7faf01927b6ffdf58ba..afcdd90524c342791b959b98d53de3fa9cbf3b4e 100644 (file)
@@ -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 */
 
 /*