diff options
| author | Anatol Belski <ab@php.net> | 2014-08-25 20:22:49 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-25 20:22:49 +0200 |
| commit | 4d997f63d98c663b2d9acccd3655572652f61c7d (patch) | |
| tree | bce31fa83a23d3ad58d640d581d498f3bdd0cbf4 /Zend/zend_API.c | |
| parent | 6f9f0bf2056f0dc17d9bcc6dd3b7d28ac878c6fc (diff) | |
| download | php-git-4d997f63d98c663b2d9acccd3655572652f61c7d.tar.gz | |
master renames phase 3
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 27668e4888..41b0149038 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -430,11 +430,11 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons return "long"; } else if (type == IS_DOUBLE) { if (c == 'L') { - if (d > ZEND_INT_MAX) { - *p = ZEND_INT_MAX; + if (d > ZEND_LONG_MAX) { + *p = ZEND_LONG_MAX; break; - } else if (d < ZEND_INT_MIN) { - *p = ZEND_INT_MIN; + } else if (d < ZEND_LONG_MIN) { + *p = ZEND_LONG_MIN; break; } } @@ -446,11 +446,11 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons case IS_DOUBLE: if (c == 'L') { - if (Z_DVAL_P(arg) > ZEND_INT_MAX) { - *p = ZEND_INT_MAX; + if (Z_DVAL_P(arg) > ZEND_LONG_MAX) { + *p = ZEND_LONG_MAX; break; - } else if (Z_DVAL_P(arg) < ZEND_INT_MIN) { - *p = ZEND_INT_MIN; + } else if (Z_DVAL_P(arg) < ZEND_LONG_MIN) { + *p = ZEND_LONG_MIN; break; } } @@ -1686,7 +1686,7 @@ ZEND_API int array_set_zval_key(HashTable *ht, zval *key, zval *value TSRMLS_DC) result = zend_symtable_update(ht, STR_EMPTY_ALLOC(), value); break; case IS_RESOURCE: - zend_error(E_STRICT, "Resource ID#" ZEND_INT_FMT " used as offset, casting to integer (%pd)", Z_RES_HANDLE_P(key), Z_RES_HANDLE_P(key)); + zend_error(E_STRICT, "Resource ID#" ZEND_LONG_FMT " used as offset, casting to integer (%pd)", Z_RES_HANDLE_P(key), Z_RES_HANDLE_P(key)); result = zend_hash_index_update(ht, Z_RES_HANDLE_P(key), value); break; case IS_FALSE: |