diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-04-11 10:11:58 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-04-11 10:11:58 +0200 |
| commit | 9663193bbc66789045800fd8a3e8c70fe34881c4 (patch) | |
| tree | 1fcc4cd9f501826bbb3f024f36d6d335cb20c7db /Zend/zend.h | |
| parent | 6828437c119c22f47fea5ea7b777aec247c5916c (diff) | |
| parent | f7ac3089506c11e54856c78da56dda3b1f237ded (diff) | |
| download | php-git-9663193bbc66789045800fd8a3e8c70fe34881c4.tar.gz | |
Merge branch 'PHP-5.6'
Diffstat (limited to 'Zend/zend.h')
| -rw-r--r-- | Zend/zend.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index b6e5ef0e4a..a226e11c60 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -589,14 +589,11 @@ typedef int (*zend_write_func_t)(const char *str, uint str_length); #define IS_STRING 6 #define IS_RESOURCE 7 #define IS_CONSTANT 8 -#define IS_CONSTANT_ARRAY 9 -#define IS_CONSTANT_AST 10 -#define IS_CALLABLE 11 +#define IS_CONSTANT_AST 9 +#define IS_CALLABLE 10 -/* Ugly hack to support constants as static array indices */ #define IS_CONSTANT_TYPE_MASK 0x00f #define IS_CONSTANT_UNQUALIFIED 0x010 -#define IS_CONSTANT_INDEX 0x080 #define IS_LEXICAL_VAR 0x020 #define IS_LEXICAL_REF 0x040 #define IS_CONSTANT_IN_NAMESPACE 0x100 |