Browse Source

Enable hypot for all

PHP-5.1
Wez Furlong 22 years ago
parent
commit
31a17d9044
  1. 2
      ext/standard/basic_functions.c
  2. 9
      ext/standard/math.c

2
ext/standard/basic_functions.c

@ -405,9 +405,7 @@ function_entry basic_functions[] = {
PHP_FE(log, NULL) PHP_FE(log, NULL)
PHP_FE(log10, NULL) PHP_FE(log10, NULL)
PHP_FE(sqrt, NULL) PHP_FE(sqrt, NULL)
#ifdef HAVE_HYPOT
PHP_FE(hypot, NULL) PHP_FE(hypot, NULL)
#endif
PHP_FE(deg2rad, NULL) PHP_FE(deg2rad, NULL)
PHP_FE(rad2deg, NULL) PHP_FE(rad2deg, NULL)
PHP_FE(bindec, NULL) PHP_FE(bindec, NULL)

9
ext/standard/math.c

@ -617,7 +617,6 @@ PHP_FUNCTION(sqrt)
/* {{{ proto float hypot(float num1, float num2) /* {{{ proto float hypot(float num1, float num2)
Returns sqrt(num1*num1 + num2*num2) */ Returns sqrt(num1*num1 + num2*num2) */
#ifdef HAVE_HYPOT
PHP_FUNCTION(hypot) PHP_FUNCTION(hypot)
{ {
zval **num1, **num2; zval **num1, **num2;
@ -627,10 +626,16 @@ PHP_FUNCTION(hypot)
} }
convert_to_double_ex(num1); convert_to_double_ex(num1);
convert_to_double_ex(num2); convert_to_double_ex(num2);
#if HAVE_HYPOT
Z_DVAL_P(return_value) = hypot(Z_DVAL_PP(num1), Z_DVAL_PP(num2)); 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; Z_TYPE_P(return_value) = IS_DOUBLE;
} }
#endif
/* }}} */ /* }}} */

Loading…
Cancel
Save