com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/standard/array.c ext/standard/php_math.h
| From: | Kalle Sommer Nielsen | Date: | Wed, 17 Aug 2016 12:15:09 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/standard/array.c ext/standard/php_math.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93906@lists.php.net to get a copy of this message | ||
Commit: 27ceb6ffb5fdfdbfb4b77b6b6bd7366f8cecaa7d
Author: Kalle Sommer Nielsen <kalle@php.net> Wed, 17 Aug 2016 14:15:09 +0200
Parents: f7231acadfe79f5d42ffd26671451610ee1e1c07 9b783107e550584b6e4b00d424d29c82b88a1286
Branches: PHP-7.1
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=27ceb6ffb5fdfdbfb4b77b6b6bd7366f8cecaa7d
Log:
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix build as done in master in commit 040331c36462eac94308bbef3200ee11389ca444
Fixed C89 build
Changed paths:
MM ext/standard/array.c
MM ext/standard/php_math.h
Diff:
diff --cc ext/standard/array.c
index cb78cad,fbbf3cf..848f109
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@@ -45,9 -45,11 +45,10 @@@
#include "basic_functions.h"
#include "php_string.h"
#include "php_rand.h"
+ #include "php_math.h"
#include "zend_smart_str.h"
-#ifdef HAVE_SPL
+#include "zend_bitset.h"
#include "ext/spl/spl_array.h"
-#endif
/* {{{ defines */
#define EXTR_OVERWRITE 0