Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix build as done in master in commit 040331c36462eac94308bbef3200ee11389ca444
  Fixed C89 build

diff --cc ext/standard/array.c
index cb78cad39c46f61c136037de9b5049e2364bd0dd,fbbf3cf07802e367a0dc3c20ab2c99758fc3f72d..848f109494dfdca795e6160c385ad824ce4f49c2
--- 1/ext/standard/array.c
--- 2/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

diff --cc ext/standard/php_math.h
Simple merge