diff options
| author | Nikita Popov <nikic@php.net> | 2014-08-25 21:59:30 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-08-25 22:04:33 +0200 |
| commit | 899a1ed59a2f7133367dc39f95b143c019822520 (patch) | |
| tree | a8fc518673cf0c94ad363d04bc3474eb3f3bfa66 /Zend/zend.h | |
| parent | af59e92b24c8f624672720d47ef65bd8457728b9 (diff) | |
| parent | 6db293d5e043d35c281a6b11cb68460f5d7188a9 (diff) | |
| download | php-git-899a1ed59a2f7133367dc39f95b143c019822520.tar.gz | |
Merge branch 'ast'POST_AST_MERGE
Conflicts:
Zend/zend_compile.c
Diffstat (limited to 'Zend/zend.h')
| -rw-r--r-- | Zend/zend.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index 0e8de14cb4..c667b6c45a 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -309,7 +309,6 @@ void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((nore #endif #include "zend_object_handlers.h" -#include "zend_ast.h" /* overloaded elements data types */ #define OE_IS_ARRAY (1<<0) @@ -401,6 +400,7 @@ void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((nore #endif #include "zend_string.h" +#include "zend_ast.h" static zend_always_inline uint32_t zval_refcount_p(zval* pz) { ZEND_ASSERT(Z_REFCOUNTED_P(pz) || Z_IMMUTABLE_P(pz)); |