diff options
| author | Jose <jose@zeroc.com> | 2017-07-11 00:55:51 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-07-11 00:55:51 +0200 |
| commit | bc390fecc4a25d3cee7afaffe0fd8c727f487482 (patch) | |
| tree | 2148451801a09dc93ebe18c7ed7fcb8fded47119 | |
| parent | Fixed typo in previous commit (ICE-8257) (diff) | |
| download | ice-bc390fecc4a25d3cee7afaffe0fd8c727f487482.tar.bz2 ice-bc390fecc4a25d3cee7afaffe0fd8c727f487482.tar.xz ice-bc390fecc4a25d3cee7afaffe0fd8c727f487482.zip | |
ICE-8252 - php5 build warning on amzn1
| -rw-r--r-- | php/src/php5/Init.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/php/src/php5/Init.cpp b/php/src/php5/Init.cpp index 72cc2f548e7..64a4850a92b 100644 --- a/php/src/php5/Init.cpp +++ b/php/src/php5/Init.cpp @@ -22,12 +22,23 @@ using namespace IcePHP; ZEND_DECLARE_MODULE_GLOBALS(ice) -ZEND_BEGIN_ARG_INFO_EX(Ice_initialize_arginfo, 1, ZEND_RETURN_VALUE, static_cast<zend_uint>(-1)) +// +// BUGFIX Avoid narrowing conversion warnings with ZEND_BEGIN_ARG_INFO_EX usage +// +#if ZEND_MODULE_API_NO >= 20041030 +ZEND_BEGIN_ARG_INFO_EX(Ice_initialize_arginfo, 1, ZEND_RETURN_VALUE, static_cast<zend_unit>(-1)) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(Ice_createProperties_arginfo, 1, ZEND_RETURN_VALUE, static_cast<zend_uint>(-1)) +ZEND_BEGIN_ARG_INFO_EX(Ice_createProperties_arginfo, 1, ZEND_RETURN_VALUE, static_cast<zend_unit>(-1)) +ZEND_END_ARG_INFO() +#else +ZEND_BEGIN_ARG_INFO_EX(Ice_initialize_arginfo, 1, ZEND_RETURN_VALUE, -1) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(Ice_createProperties_arginfo, 1, ZEND_RETURN_VALUE, -1) +ZEND_END_ARG_INFO() +#endif + #ifdef ICEPHP_USE_NAMESPACES # define ICEPHP_COMMUNICATOR_FUNCTIONS \ ZEND_NS_NAMED_FE("Ice", initialize, ZEND_FN(Ice_initialize), Ice_initialize_arginfo) \ |