From: George Schlossnagle Date: Mon, 21 Jul 2003 06:05:58 +0000 (+0000) Subject: reverted at Andi's request. replaced with more generic wrapper. X-Git-Tag: BEFORE_ARG_INFO~161 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0229aad04232dce0b5f8bb3b36bba1bf57999025;p=php reverted at Andi's request. replaced with more generic wrapper. --- diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 19223b8b73..9a7271033c 100644 --- 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)))