From 31a17d904455d18ca21c40aee1a0c7976accce72 Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Mon, 20 Sep 2004 22:08:06 +0000 Subject: [PATCH] Enable hypot for all --- ext/standard/basic_functions.c | 2 -- ext/standard/math.c | 9 +++++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 08e7578601..0ca118a4cd 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -405,9 +405,7 @@ function_entry basic_functions[] = { PHP_FE(log, NULL) PHP_FE(log10, NULL) PHP_FE(sqrt, NULL) -#ifdef HAVE_HYPOT PHP_FE(hypot, NULL) -#endif PHP_FE(deg2rad, NULL) PHP_FE(rad2deg, NULL) PHP_FE(bindec, NULL) diff --git a/ext/standard/math.c b/ext/standard/math.c index 8a2b3ecec1..3543e22213 100644 --- a/ext/standard/math.c +++ b/ext/standard/math.c @@ -617,7 +617,6 @@ PHP_FUNCTION(sqrt) /* {{{ proto float hypot(float num1, float num2) Returns sqrt(num1*num1 + num2*num2) */ -#ifdef HAVE_HYPOT PHP_FUNCTION(hypot) { zval **num1, **num2; @@ -627,10 +626,16 @@ PHP_FUNCTION(hypot) } convert_to_double_ex(num1); convert_to_double_ex(num2); +#if HAVE_HYPOT Z_DVAL_P(return_value) = hypot(Z_DVAL_PP(num1), Z_DVAL_PP(num2)); +#elif defined(_MSC_VER) + Z_DVAL_P(return_value) = _hypot(Z_DVAL_PP(num1), Z_DVAL_PP(num2)); +#else + Z_DVAL_P(return_value) = sqrt((Z_DVAL_PP(num1) * Z_DVAL_PP(num1)) + + (Z_DVAL_PP(num2) * Z_DVAL_PP(num2))); +#endif Z_TYPE_P(return_value) = IS_DOUBLE; } -#endif /* }}} */ -- 2.40.0