From: Kalle Sommer Nielsen <kalle@php.net>
Date: Wed, 17 Aug 2016 12:15:09 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0beta3~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=27ceb6ffb5fdfdbfb4b77b6b6bd7366f8cecaa7d;p=php

Merge branch 'PHP-7.0' into PHP-7.1

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

27ceb6ffb5fdfdbfb4b77b6b6bd7366f8cecaa7d
diff --cc ext/standard/array.c
index cb78cad39c,fbbf3cf078..848f109494
--- 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