bjori Sun Aug 27 18:20:40 2006 UTC
Added files:
/php-src/ext/standard/tests/math constants.phpt
Modified files:
/php-src/ext/standard math.c basic_functions.c
Log:
Register missing math constants (been missing since 4.0.2!)
Remove M_PI from math.c (its defined in php_math.h)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/math.c?r1=1.135&r2=1.136&diff_format=u
Index: php-src/ext/standard/math.c
diff -u php-src/ext/standard/math.c:1.135 php-src/ext/standard/math.c:1.136
--- php-src/ext/standard/math.c:1.135 Sun Jul 16 10:49:06 2006
+++ php-src/ext/standard/math.c Sun Aug 27 18:20:39 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: math.c,v 1.135 2006/07/16 10:49:06 helly Exp $ */
+/* $Id: math.c,v 1.136 2006/08/27 18:20:39 bjori Exp $ */
#include "php.h"
#include "php_math.h"
@@ -29,10 +29,6 @@
#include <float.h>
#include <stdlib.h>
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
#ifndef PHP_ROUND_FUZZ
# ifndef PHP_WIN32
# define PHP_ROUND_FUZZ 0.50000000001
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.797&r2=1.798&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.797
php-src/ext/standard/basic_functions.c:1.798
--- php-src/ext/standard/basic_functions.c:1.797 Wed Jul 26 08:57:11 2006
+++ php-src/ext/standard/basic_functions.c Sun Aug 27 18:20:39 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.797 2006/07/26 08:57:11 tony2001 Exp $ */
+/* $Id: basic_functions.c,v 1.798 2006/08/27 18:20:39 bjori Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -3976,9 +3976,13 @@
REGISTER_MATH_CONSTANT(M_PI_4);
REGISTER_MATH_CONSTANT(M_1_PI);
REGISTER_MATH_CONSTANT(M_2_PI);
+ REGISTER_MATH_CONSTANT(M_SQRTPI);
REGISTER_MATH_CONSTANT(M_2_SQRTPI);
+ REGISTER_MATH_CONSTANT(M_LNPI);
+ REGISTER_MATH_CONSTANT(M_EULER);
REGISTER_MATH_CONSTANT(M_SQRT2);
REGISTER_MATH_CONSTANT(M_SQRT1_2);
+ REGISTER_MATH_CONSTANT(M_SQRT3);
REGISTER_DOUBLE_CONSTANT("INF", php_get_inf(), CONST_CS |
CONST_PERSISTENT);
REGISTER_DOUBLE_CONSTANT("NAN", php_get_nan(), CONST_CS |
CONST_PERSISTENT);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/constants.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/math/constants.phpt
+++ php-src/ext/standard/tests/math/constants.phpt
--TEST--
Math constants
--FILE--
<?php
$constants = array(
"M_E",
"M_LOG2E",
"M_LOG10E",
"M_LN2",
"M_LN10",
"M_PI",
"M_PI_2",
"M_PI_4",
"M_1_PI",
"M_2_PI",
"M_SQRTPI",
"M_2_SQRTPI",
"M_LNPI",
"M_EULER",
"M_SQRT2",
"M_SQRT1_2",
"M_SQRT3"
);
foreach($constants as $constant) {
printf("%-10s: %.14s\n", $constant, constant($constant));
}
?>
--EXPECT--
M_E : 2.718281828459
M_LOG2E : 1.442695040889
M_LOG10E : 0.434294481903
M_LN2 : 0.693147180559
M_LN10 : 2.302585092994
M_PI : 3.141592653589
M_PI_2 : 1.570796326794
M_PI_4 : 0.785398163397
M_1_PI : 0.318309886183
M_2_PI : 0.636619772367
M_SQRTPI : 1.772453850905
M_2_SQRTPI: 1.128379167095
M_LNPI : 1.144729885849
M_EULER : 0.577215664901
M_SQRT2 : 1.414213562373
M_SQRT1_2 : 0.707106781186
M_SQRT3 : 1.732050807568
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
