diff options
author | Anatol Belski <ab@php.net> | 2014-08-22 08:58:03 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-08-22 08:58:03 +0200 |
commit | 79f888a602db3814a6ab03183eff6375bfe9234a (patch) | |
tree | f1b6d1fb76ca4d613a5cc1b551057dac33d3f585 /ext/standard/php_math.h | |
parent | da35db3ec5fc4b27087292c067a6ea1d0f77bf8f (diff) | |
parent | 411b920a6f8d53025caddb30895b27d04a3576b4 (diff) | |
download | php-git-79f888a602db3814a6ab03183eff6375bfe9234a.tar.gz |
Merge remote-tracking branch 'weltling/master'POST_64BIT_BRANCH_MERGE
* weltling/master: (725 commits)
fix zpp
fixed array_pad()
fix zpp
fix zpp
fix zpp
fix zpp and a bit more
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fixed the test
...
Diffstat (limited to 'ext/standard/php_math.h')
-rw-r--r-- | ext/standard/php_math.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/php_math.h b/ext/standard/php_math.h index a2dca282c5..f8be7da42c 100644 --- a/ext/standard/php_math.h +++ b/ext/standard/php_math.h @@ -25,7 +25,7 @@ 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 TSRMLS_DC); -PHPAPI long _php_math_basetolong(zval *arg, int base); +PHPAPI php_int_t _php_math_basetolong(zval *arg, int base); PHPAPI int _php_math_basetozval(zval *arg, int base, zval *ret); PHPAPI zend_string * _php_math_zvaltobase(zval *arg, int base TSRMLS_DC); |