reverted at Andi's request. replaced with more generic wrapper.

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 19223b8b736f132d7812333fae5e84aa262906ee..9a7271033c211e0ff15cca4f4368e63ce4cc0f1e 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -413,25 +413,11 @@ ZEND_API ZEND_FUNCTION(display_disabled_class);
 #define ZEND_SET_GLOBAL_VAR_WITH_LENGTH(name, name_length, var, _refcount, _is_ref)            \
        ZEND_SET_SYMBOL_WITH_LENGTH(&EG(symbol_table), name, name_length, var, _refcount, _is_ref)
 
-#define ZEND_PRIVATE_PROPERTY(class_ptr, name, value)                                                          \
+#define ZEND_DEFINE_PROPERTY(class_ptr, name, value, mask)                                                             \
 {                                                                                                                                                                      \
        char *_name = (name);                                                                                                                   \
        int namelen = strlen(_name);                                                                                                    \
-       zend_declare_property(class_ptr, _name, namelen, value, ZEND_ACC_PRIVATE);              \
-}
-
-#define ZEND_PROTECTED_PROPERTY(class_ptr, name, value)                                                                \
-{                                                                                                                                                                      \
-       char *_name = (name);                                                                                                                   \
-       int namelen = strlen(_name);                                                                                                    \
-       zend_declare_property(class_ptr, _name, namelen, value, ZEND_ACC_PROTECTED);    \
-}
-
-#define ZEND_PUBLIC_PROPERTY(class_ptr, name, value)                                                           \
-{                                                                                                                                                                      \
-       char *_name = (name);                                                                                                                   \
-       int namelen = strlen(_name);                                                                                                    \
-       zend_declare_property(class_ptr, _name, namelen, value, ZEND_ACC_PUBLIC);               \
+       zend_declare_property(class_ptr, _name, namelen, value, mask);          \
 }
 
 #define HASH_OF(p) ((p)->type==IS_ARRAY ? (p)->value.ht : (((p)->type==IS_OBJECT ? Z_OBJ_HT_P(p)->get_properties((p) TSRMLS_CC) : NULL)))