cvs: /php4/ext/standard basic_functions.c math.c phpmath.h

hholzgra Sat Apr 8 16:53:49 2000 EDT Modified files: /php4/ext/standard basic_functions.c math.c phpmath.h Log: added the other usefull constants besides M_PI from math.h as PHP constants Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.180 php4/ext/standard/basic_functions.c:1.181 --- php4/ext/standard/basic_functions.c:1.180 Wed Apr 5 14:43:02 2000 +++ php4/ext/standard/basic_functions.c Sat Apr 8 16:53:19 2000 @@ -23,6 +23,7 @@ #include "php_ini.h" #include "internal_functions_registry.h" #include "php_standard.h" +#include "phpmath.h" #include "ext/standard/info.h" #include "zend_operators.h" #include <stdarg.h> @@ -568,9 +569,6 @@ } #endif -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif void test_class_startup(void); @@ -598,9 +596,23 @@ #else basic_globals_ctor(BLS_C); #endif - - REGISTER_DOUBLE_CONSTANT("M_PI", M_PI, CONST_CS | CONST_PERSISTENT); +#define REGISTER_MATH_CONSTANT(x) REGISTER_DOUBLE_CONSTANT(#x, x, CONST_CS | CONST_PERSISTENT) + REGISTER_MATH_CONSTANT(M_E); + REGISTER_MATH_CONSTANT(M_LOG2E); + REGISTER_MATH_CONSTANT(M_LOG10E); + REGISTER_MATH_CONSTANT(M_LN2); + REGISTER_MATH_CONSTANT(M_LN10); + REGISTER_MATH_CONSTANT(M_PI); + REGISTER_MATH_CONSTANT(M_PI_2); + REGISTER_MATH_CONSTANT(M_PI_4); + REGISTER_MATH_CONSTANT(M_1_PI); + REGISTER_MATH_CONSTANT(M_2_PI); + REGISTER_MATH_CONSTANT(M_2_SQRTPI); + REGISTER_MATH_CONSTANT(M_SQRT2); + REGISTER_MATH_CONSTANT(M_SQRT1_2); + + test_class_startup(); REGISTER_INI_ENTRIES(); Index: php4/ext/standard/math.c diff -u php4/ext/standard/math.c:1.19 php4/ext/standard/math.c:1.20 --- php4/ext/standard/math.c:1.19 Sun Mar 12 09:18:21 2000 +++ php4/ext/standard/math.c Sat Apr 8 16:53:19 2000 @@ -30,6 +30,7 @@ #define M_PI 3.14159265358979323846 #endif + char *_php_math_number_format(double, int, char ,char); /* {{{ proto int abs(int number) Index: php4/ext/standard/phpmath.h diff -u php4/ext/standard/phpmath.h:1.2 php4/ext/standard/phpmath.h:1.3 --- php4/ext/standard/phpmath.h:1.2 Sun May 16 04:19:26 1999 +++ php4/ext/standard/phpmath.h Sat Apr 8 16:53:19 2000 @@ -29,7 +29,7 @@ */ -/* $Id: phpmath.h,v 1.2 1999/05/16 11:19:26 sas Exp $ */ +/* $Id: phpmath.h,v 1.3 2000/04/08 23:53:19 hholzgra Exp $ */ #ifndef _PHPMATH_H #define _PHPMATH_H @@ -66,5 +66,58 @@ PHP_FUNCTION(number_format); PHP_FUNCTION(deg2rad); PHP_FUNCTION(rad2deg); + + +#ifndef M_E +#define M_E 2.7182818284590452354 /* e */ +#endif + +#ifndef M_LOG2E +#define M_LOG2E 1.4426950408889634074 /* log_2 e */ +#endif + +#ifndef M_LOG10E +#define M_LOG10E 0.43429448190325182765 /* log_10 e */ +#endif + +#ifndef M_LN2 +#define M_LN2 0.69314718055994530942 /* log_e 2 */ +#endif + +#ifndef M_LN10 +#define M_LN10 2.30258509299404568402 /* log_e 10 */ +#endif + +#ifndef M_PI +#define M_PI 3.14159265358979323846 /* pi */ +#endif + +#ifndef M_PI_2 +#define M_PI_2 1.57079632679489661923 /* pi/2 */ +#endif + +#ifndef M_PI_4 +#define M_PI_4 0.78539816339744830962 /* pi/4 */ +#endif + +#ifndef M_1_PI +#define M_1_PI 0.31830988618379067154 /* 1/pi */ +#endif + +#ifndef M_2_PI +#define M_2_PI 0.63661977236758134308 /* 2/pi */ +#endif + +#ifndef M_2_SQRTPI +#define M_2_SQRTPI 1.12837916709551257390 /* 2/sqrt(pi) */ +#endif + +#ifndef M_SQRT2 +#define M_SQRT2 1.41421356237309504880 /* sqrt(2) */ +#endif + +#ifndef M_SQRT1_2 +#define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */ +#endif #endif /* _PHPMATH_H */