Permalink
Browse files

- Move zend_object_value definition to zend_type.h

# Types declared there can be used in configure stuff already. zend.h is
# being created by configure...
  • Loading branch information...
Marcus Boerger
Marcus Boerger committed Dec 20, 2005
1 parent e072c3e commit c80e82230b5af695f81a8276cec5dbe2c0c44532
Showing with 11 additions and 10 deletions.
  1. +0 −8 Zend/zend.h
  2. +3 −2 Zend/zend_object_handlers.h
  3. +8 −0 Zend/zend_types.h
View
@@ -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 */
@@ -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);
View
@@ -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 */
/*

0 comments on commit c80e822

Please sign in to comment.