php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.0' into PHP-7.1

Browse Source 
* PHP-7.0:
  Fix build as done in master in commit 040331c364
  Fixed C89 build
This commit is contained in:
Kalle Sommer Nielsen
2016-08-17 14:15:09 +02:00
parent f7231acadf 9b783107e5
commit 27ceb6ffb5
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/standard/array.c
+2 -1
View File
@@ -45,6 +45,7 @@
#include "basic_functions.h"
#include "php_string.h"
#include "php_rand.h"
#include "php_math.h"
#include "zend_smart_str.h"
#include "zend_bitset.h"
#include "ext/spl/spl_array.h"
@@ -2141,7 +2142,7 @@ PHP_FUNCTION(array_fill_keys)
php_error_docref(NULL, E_WARNING, "The supplied range exceeds the maximum array size: start=%0.0f end=%0.0f", end, start); \
RETURN_FALSE; \
} \
size = (uint32_t)round(__calc_size); \
size = (uint32_t)_php_math_round(__calc_size, 0, PHP_ROUND_HALF_UP); \
array_init_size(return_value, size); \
zend_hash_real_init(Z_ARRVAL_P(return_value), 1); \
} while (0)
ext/standard/php_math.h
+1
View File
@@ -22,6 +22,7 @@
#ifndef PHP_MATH_H
#define PHP_MATH_H
PHPAPI double _php_math_round(double, int, int);
PHPAPI zend_string *_php_math_number_format(double, int, char, char);
PHPAPI zend_string *_php_math_number_format_ex(double, int, char *, size_t, char *, size_t);
PHPAPI zend_string * _php_math_longtobase(zval *arg, int base);