diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-02-01 11:12:28 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-02-01 11:12:28 +0300 |
| commit | d510255879693f666fd4767611d4dcb96a9ebbc7 (patch) | |
| tree | ed7f5ccaad9b7d2d0f2bc6648d39c814b578a9e8 /Zend/zend_types.h | |
| parent | 472ef79f2b1569b7bc3d8a6e60d855b26db3c587 (diff) | |
| download | php-git-d510255879693f666fd4767611d4dcb96a9ebbc7.tar.gz | |
Rename IS_ERROR into _IS_ERROR (to prevent redefinition on Windows).
Diffstat (limited to 'Zend/zend_types.h')
| -rw-r--r-- | Zend/zend_types.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Zend/zend_types.h b/Zend/zend_types.h index ebd9e0e3ef..5207386ccf 100644 --- a/Zend/zend_types.h +++ b/Zend/zend_types.h @@ -324,7 +324,7 @@ struct _zend_ast_ref { /* internal types */ #define IS_INDIRECT 15 #define IS_PTR 17 -#define IS_ERROR 19 +#define _IS_ERROR 19 static zend_always_inline zend_uchar zval_get_type(const zval* pz) { return pz->u1.v.type; @@ -503,6 +503,9 @@ static zend_always_inline zend_uchar zval_get_type(const zval* pz) { #define Z_ISNULL(zval) (Z_TYPE(zval) == IS_NULL) #define Z_ISNULL_P(zval_p) Z_ISNULL(*(zval_p)) +#define Z_ISERROR(zval) (Z_TYPE(zval) == _IS_ERROR) +#define Z_ISERROR_P(zval_p) Z_ISERROR(*(zval_p)) + #define Z_LVAL(zval) (zval).value.lval #define Z_LVAL_P(zval_p) Z_LVAL(*(zval_p)) @@ -783,7 +786,7 @@ static zend_always_inline zend_uchar zval_get_type(const zval* pz) { } while (0) #define ZVAL_ERROR(z) do { \ - Z_TYPE_INFO_P(z) = IS_ERROR; \ + Z_TYPE_INFO_P(z) = _IS_ERROR; \ } while (0) #define Z_REFCOUNT_P(pz) zval_refcount_p(pz) |