diff options
| author | Jose <jose@zeroc.com> | 2017-09-01 20:39:47 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-09-01 20:53:17 +0200 |
| commit | 40187823a8d45d5b8a966427bdd73eafd654ff0a (patch) | |
| tree | a50e227e6c82171c4d9799ad6a2af858a9fb7646 | |
| parent | Fixed ICE-8396 - improved allTests.py handling of Ctrl-C interrupts (diff) | |
| download | ice-40187823a8d45d5b8a966427bdd73eafd654ff0a.tar.bz2 ice-40187823a8d45d5b8a966427bdd73eafd654ff0a.tar.xz ice-40187823a8d45d5b8a966427bdd73eafd654ff0a.zip | |
Fix PHP build warnings
ZEND_MODULE_API_NO number used in Init.cpp bugfix was bogus
required_num_args member of _zend_arg_info was changed to
zend_uint in PHP 5.4.0 that correspond to ZEND_MODULE_API_NO
20100525
See bug (ICE-8479)
| -rw-r--r-- | php/src/php5/Init.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/php/src/php5/Init.cpp b/php/src/php5/Init.cpp index b2490c9d080..1b767212974 100644 --- a/php/src/php5/Init.cpp +++ b/php/src/php5/Init.cpp @@ -24,8 +24,9 @@ ZEND_DECLARE_MODULE_GLOBALS(ice) // // BUGFIX Avoid narrowing conversion warnings with ZEND_BEGIN_ARG_INFO_EX usage +// in PHP >= 5.4 // -#if ZEND_MODULE_API_NO >= 20121212 +#if ZEND_MODULE_API_NO >= 20100525 ZEND_BEGIN_ARG_INFO_EX(Ice_initialize_arginfo, 1, ZEND_RETURN_VALUE, static_cast<zend_uint>(-1)) ZEND_END_ARG_INFO() |