com php-src: Fixed bug #70057 (Build failure on 32-bit Mac OS X 10.6.8: recursive inlining): Zend/zend_operators.c

From: Date: Mon, 13 Jul 2015 08:22:55 +0000
Subject: com php-src: Fixed bug #70057 (Build failure on 32-bit Mac OS X 10.6.8: recursive inlining): Zend/zend_operators.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-87943@lists.php.net to get a copy of this message
Commit: e5a996f26855fe89459ae7dcc31034e44e70b91d Author: Xinchen Hui <laruence@php.net> Mon, 13 Jul 2015 16:22:55 +0800 Parents: eef41c57a356b7de3e773886a1acd8c9faa75a2d Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e5a996f26855fe89459ae7dcc31034e44e70b91d Log: Fixed bug #70057 (Build failure on 32-bit Mac OS X 10.6.8: recursive inlining) Bugs: https://bugs.php.net/70057 Changed paths: M Zend/zend_operators.c Diff: diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 64c2620..b38beb2 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1760,7 +1760,7 @@ static inline void zend_free_obj_get_result(zval *op) /* {{{ */ } /* }}} */ -static zend_always_inline int i_compare_function(zval *result, zval *op1, zval *op2) /* {{{ */ +ZEND_API int ZEND_FASTCALL compare_function(zval *result, zval *op1, zval *op2) /* {{{ */ { int ret; int converted = 0; @@ -1942,15 +1942,9 @@ static zend_always_inline int i_compare_function(zval *result, zval *op1, zval * } /* }}} */ -ZEND_API int ZEND_FASTCALL compare_function(zval *result, zval *op1, zval *op2) /* {{{ */ -{ - return i_compare_function(result, op1, op2); -} -/* }}} */ - ZEND_API int zval_compare_function(zval *result, zval *op1, zval *op2) /* {{{ */ { - return i_compare_function(result, op1, op2); + return compare_function(result, op1, op2); } /* }}} */

« previous php.cvs (#87943) next »