diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-06-16 11:18:45 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-06-16 11:18:45 +0200 |
| commit | 3c2b42ac41d01f856548b350945018ad2b485942 (patch) | |
| tree | 8b09feb09dd596d125041c06dffe1a1971c6c05f | |
| parent | 6788f14f5ef441a17e0a430846e65ead4b7e6025 (diff) | |
| parent | e93f8e74d43d524a482ce43e5a62ca1980fe56c7 (diff) | |
| download | php-git-3c2b42ac41d01f856548b350945018ad2b485942.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
Zend/zend_compile.c
| -rw-r--r-- | Zend/zend_compile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index f1c8a678ca..7c979d56b7 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3461,7 +3461,7 @@ static char * zend_get_function_declaration(zend_function *fptr TSRMLS_DC) /* {{ *zv = *precv->op2.zv; zval_copy_ctor(zv); INIT_PZVAL(zv); - if (Z_TYPE_P(zv) == IS_CONSTANT) { + if ((Z_TYPE_P(zv) & IS_CONSTANT_TYPE_MASK) == IS_CONSTANT) { REALLOC_BUF_IF_EXCEED(buf, offset, length, Z_STRLEN_P(zv)); memcpy(offset, Z_STRVAL_P(zv), Z_STRLEN_P(zv)); offset += Z_STRLEN_P(zv); @@ -3490,7 +3490,7 @@ static char * zend_get_function_declaration(zend_function *fptr TSRMLS_DC) /* {{ } else if (Z_TYPE_P(zv) == IS_ARRAY) { memcpy(offset, "Array", 5); offset += 5; - } else if (Z_TYPE_P(zv) == IS_CONSTANT_AST) { + } else if ((Z_TYPE_P(zv) & IS_CONSTANT_TYPE_MASK) == IS_CONSTANT_AST) { memcpy(offset, "<expression>", 12); offset += 12; } else { |