summaryrefslogtreecommitdiff
path: root/Zend/zend_API.h
diff options
context:
space:
mode:
authorAnthony Ferrara <ircmaxell@gmail.com>2015-02-18 10:26:29 -0500
committerAnthony Ferrara <ircmaxell@gmail.com>2015-02-18 10:26:29 -0500
commit00b3e77ead0f0222959f29eb81819f2a566ab07d (patch)
tree8d12c94b722ca506af355c29c1fcd0c753d40bb9 /Zend/zend_API.h
parentd6bea5bb1e5f4811e45162343cb7e513d9fcbec5 (diff)
downloadphp-git-00b3e77ead0f0222959f29eb81819f2a566ab07d.tar.gz
Move declare() to the top of the file only, and allow int->float generalization
Diffstat (limited to 'Zend/zend_API.h')
-rw-r--r--Zend/zend_API.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 4f12834bcf..9e398b8696 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -1145,7 +1145,7 @@ static zend_always_inline int zend_parse_arg_double(zval *arg, double *dest, zen
*is_null = 0;
}
- if (UNEXPECTED(strict && Z_TYPE_P(arg) != IS_DOUBLE && !(check_null && Z_TYPE_P(arg) == IS_NULL))) {
+ if (UNEXPECTED(strict && Z_TYPE_P(arg) != IS_DOUBLE && Z_TYPE_P(arg) != IS_LONG && !(check_null && Z_TYPE_P(arg) == IS_NULL))) {
return 0;
}