diff options
| author | Guilherme Blanco <guilhermeblanco@hotmail.com> | 2015-02-12 23:19:14 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-02-12 23:20:19 +0100 |
| commit | 8c81d80e10e0f189307fc8ff4a8fb34bd0cb1fcb (patch) | |
| tree | 962ecf3dbea41b0d4d539a60498b6942304bd844 /Zend/zend_compile.h | |
| parent | a0d472e1dad4a1cb719ba56a1ca4da19fadfdfb3 (diff) | |
| download | php-git-8c81d80e10e0f189307fc8ff4a8fb34bd0cb1fcb.tar.gz | |
Made ZEND_ACC_TRAIT a saner value
CC_TRAIT valued as 0x120 is too magical to be comprehensible by others.
Diffstat (limited to 'Zend/zend_compile.h')
| -rw-r--r-- | Zend/zend_compile.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index d39f1285f4..1104a29b82 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -191,8 +191,8 @@ typedef struct _zend_try_catch_element { /* ZEND_ACC_EXPLICIT_ABSTRACT_CLASS denotes that a class was explicitly defined as abstract by using the keyword. */ #define ZEND_ACC_IMPLICIT_ABSTRACT_CLASS 0x10 #define ZEND_ACC_EXPLICIT_ABSTRACT_CLASS 0x20 -#define ZEND_ACC_INTERFACE 0x80 -#define ZEND_ACC_TRAIT 0x120 +#define ZEND_ACC_INTERFACE 0x40 +#define ZEND_ACC_TRAIT 0x80 /* method flags (visibility) */ /* The order of those must be kept - public < protected < private */ @@ -258,8 +258,6 @@ typedef struct _zend_try_catch_element { /* Function has a return type hint (or class has such non-private function) */ #define ZEND_ACC_HAS_RETURN_TYPE 0x40000000 -#define ZEND_CE_IS_TRAIT(ce) (((ce)->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) - char *zend_visibility_string(uint32_t fn_flags); typedef struct _zend_property_info { |