diff options
| author | Adam Harvey <aharvey@php.net> | 2013-07-23 11:15:43 -0700 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2013-07-23 11:15:43 -0700 |
| commit | f9000fde98195844b4d1c1d6209f9796da3ebee8 (patch) | |
| tree | e309bc273376385efd107a4b2994d6fa13e7de8a /ext/spl | |
| parent | f00d796b7ef290b4fa515ae09afc34f17201528f (diff) | |
| download | php-git-f9000fde98195844b4d1c1d6209f9796da3ebee8.tar.gz | |
Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
On most platforms, this works fine, but on Linux armhf, strncmp() is a macro
rather than a real function, ergo the macro expansion of ZEND_STRL doesn't
occur until after the compiler knows it needs three parameters for strncmp()
and we get a compile error.
Fixes the fix for bug #61697.
Diffstat (limited to 'ext/spl')
| -rw-r--r-- | ext/spl/php_spl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index c3a774ea96..a5ffdb7d14 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -744,7 +744,7 @@ PHP_FUNCTION(spl_autoload_functions) add_next_index_string(tmp, alfi->func_ptr->common.function_name, 1); add_next_index_zval(return_value, tmp); } else { - if (strncmp(alfi->func_ptr->common.function_name, ZEND_STRL("__lambda_func"))) { + if (strncmp(alfi->func_ptr->common.function_name, "__lambda_func", sizeof("__lambda_func") - 1)) { add_next_index_string(return_value, alfi->func_ptr->common.function_name, 1); } else { char *key; |