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_operators.h | |
| parent | af59e92b24c8f624672720d47ef65bd8457728b9 (diff) | |
| parent | 6db293d5e043d35c281a6b11cb68460f5d7188a9 (diff) | |
| download | php-git-POST_AST_MERGE.tar.gz | |
Merge branch 'ast'POST_AST_MERGE
Conflicts:
Zend/zend_compile.c
Diffstat (limited to 'Zend/zend_operators.h')
| -rw-r--r-- | Zend/zend_operators.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index a7f920bbac..a5b324e8b9 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -448,7 +448,7 @@ END_EXTERN_C() } #define convert_to_boolean_ex(pzv) convert_to_ex_master(pzv, boolean, _IS_BOOL) -#define convert_to_long_ex(pzv) convert_to_ex_master(pzv, int, IS_LONG) +#define convert_to_long_ex(pzv) convert_to_ex_master(pzv, long, IS_LONG) #define convert_to_double_ex(pzv) convert_to_ex_master(pzv, double, IS_DOUBLE) #define convert_to_string_ex(pzv) convert_to_ex_master(pzv, string, IS_STRING) #define convert_to_array_ex(pzv) convert_to_ex_master(pzv, array, IS_ARRAY) |