summaryrefslogtreecommitdiff
path: root/php/src
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2020-12-03 14:25:42 -0500
committerJoe George <joe@zeroc.com>2020-12-03 14:25:42 -0500
commitd7c8a55f1681a0a4bf0fb1928b5d54ec6b381016 (patch)
treea8c54e9d69ef15490697782ea0b9fe934d0abdf0 /php/src
parentAdd missing ice_void_arginfo to php5 (diff)
downloadice-d7c8a55f1681a0a4bf0fb1928b5d54ec6b381016.tar.bz2
ice-d7c8a55f1681a0a4bf0fb1928b5d54ec6b381016.tar.xz
ice-d7c8a55f1681a0a4bf0fb1928b5d54ec6b381016.zip
Additional PHP 5 fix to avoid narrowing conversion
Diffstat (limited to 'php/src')
-rw-r--r--php/src/php/Config.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/php/src/php/Config.h b/php/src/php/Config.h
index c5d9db61d57..c06224453a0 100644
--- a/php/src/php/Config.h
+++ b/php/src/php/Config.h
@@ -119,7 +119,8 @@ ZEND_BEGIN_MODULE_GLOBALS(ice)
ZEND_END_MODULE_GLOBALS(ice)
// A void arginfo used for methods which do not take parameters.
-ZEND_BEGIN_ARG_INFO(ice_void_arginfo, 0)
+// Avoid narrowing conversion warnings with ZEND_BEGIN_ARG_INFO_EX usage in PHP >= 5.4
+ZEND_BEGIN_ARG_INFO_EX(ice_void_arginfo, 0, ZEND_RETURN_VALUE, static_cast<zend_uint>(-1))
ZEND_END_ARG_INFO()
#ifdef ZTS