From c081ce628f0d76d44784d7bb8e06428b06142ac0 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 3 Jan 2014 11:08:10 +0800 Subject: Bump year --- ext/standard/php_math.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/standard/php_math.h') diff --git a/ext/standard/php_math.h b/ext/standard/php_math.h index 116acd9df5..8dec21acf3 100644 --- a/ext/standard/php_math.h +++ b/ext/standard/php_math.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | -- cgit v1.2.1 From 40e053e7f333b5fc3f4c75c964600666810cc969 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 13 Feb 2014 17:54:23 +0400 Subject: Use better data structures (incomplete) --- ext/standard/php_math.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext/standard/php_math.h') diff --git a/ext/standard/php_math.h b/ext/standard/php_math.h index 8dec21acf3..01d2152ccc 100644 --- a/ext/standard/php_math.h +++ b/ext/standard/php_math.h @@ -22,12 +22,12 @@ #ifndef PHP_MATH_H #define PHP_MATH_H -PHPAPI char *_php_math_number_format(double, int, char, char); -PHPAPI char *_php_math_number_format_ex(double, int, char *, size_t, char *, size_t); -PHPAPI char * _php_math_longtobase(zval *arg, int base); +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); PHPAPI long _php_math_basetolong(zval *arg, int base); PHPAPI int _php_math_basetozval(zval *arg, int base, zval *ret); -PHPAPI char * _php_math_zvaltobase(zval *arg, int base TSRMLS_DC); +PHPAPI zend_string * _php_math_zvaltobase(zval *arg, int base TSRMLS_DC); PHP_FUNCTION(sin); PHP_FUNCTION(cos); -- cgit v1.2.1 From 20f2e5986e7d9e5978eaed8d6d60cd6bf917ea37 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 9 Apr 2014 15:51:28 +0200 Subject: Fix ZTS build This only makes it compile, it doesn't actually work, presumably because interned strings are assumed in some places. --- ext/standard/php_math.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/standard/php_math.h') diff --git a/ext/standard/php_math.h b/ext/standard/php_math.h index 01d2152ccc..0334ac40ce 100644 --- a/ext/standard/php_math.h +++ b/ext/standard/php_math.h @@ -24,7 +24,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); +PHPAPI zend_string * _php_math_longtobase(zval *arg, int base TSRMLS_DC); PHPAPI long _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); -- cgit v1.2.1 From a521fe51d34c64b216fbeb89060eaaefbfb2fc52 Mon Sep 17 00:00:00 2001 From: Andrea Faulds Date: Tue, 15 Jul 2014 00:35:26 +0100 Subject: Implemented intdiv() --- ext/standard/php_math.h | 1 + 1 file changed, 1 insertion(+) (limited to 'ext/standard/php_math.h') diff --git a/ext/standard/php_math.h b/ext/standard/php_math.h index 8dec21acf3..8c168e7d3a 100644 --- a/ext/standard/php_math.h +++ b/ext/standard/php_math.h @@ -66,6 +66,7 @@ PHP_FUNCTION(number_format); PHP_FUNCTION(fmod); PHP_FUNCTION(deg2rad); PHP_FUNCTION(rad2deg); +PHP_FUNCTION(intdiv); /* WARNING: these functions are expermental: they could change their names or -- cgit v1.2.1 From b7e7a895414bd1821686932d57949f1ad0693900 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 16 Aug 2014 12:55:13 +0200 Subject: several fixes - - param parsing Z_PARAM_STR vs Z_PARAM_STRING - some functions for new params - etc --- ext/standard/php_math.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/standard/php_math.h') 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); -- cgit v1.2.1 From c3e3c98ec666812daaaca896cf5ef758a8a6df14 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 25 Aug 2014 19:24:55 +0200 Subject: master renames phase 1 --- ext/standard/php_math.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/standard/php_math.h') diff --git a/ext/standard/php_math.h b/ext/standard/php_math.h index f8be7da42c..afdf54166f 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 php_int_t _php_math_basetolong(zval *arg, int base); +PHPAPI zend_long _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); -- cgit v1.2.1 From d0cb715373c3fbe9dc095378ec5ed8c71f799f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= Date: Fri, 19 Sep 2014 18:33:14 +0200 Subject: s/PHP 5/PHP 7/ --- ext/standard/php_math.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/standard/php_math.h') diff --git a/ext/standard/php_math.h b/ext/standard/php_math.h index afdf54166f..7fb6909e7f 100644 --- a/ext/standard/php_math.h +++ b/ext/standard/php_math.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ -- cgit v1.2.1