wez Mon Sep 20 18:08:07 2004 EDT
Modified files:
/php-src/ext/standard basic_functions.c math.c
Log:
Enable hypot for all
http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.687&r2=1.688&ty=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.687
php-src/ext/standard/basic_functions.c:1.688
--- php-src/ext/standard/basic_functions.c:1.687 Mon Sep 13 23:48:16 2004
+++ php-src/ext/standard/basic_functions.c Mon Sep 20 18:08:05 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.687 2004/09/14 03:48:16 pollita Exp $ */
+/* $Id: basic_functions.c,v 1.688 2004/09/20 22:08:05 wez Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -405,9 +405,7 @@
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)
http://cvs.php.net/diff.php/php-src/ext/standard/math.c?r1=1.117&r2=1.118&ty=u
Index: php-src/ext/standard/math.c
diff -u php-src/ext/standard/math.c:1.117 php-src/ext/standard/math.c:1.118
--- php-src/ext/standard/math.c:1.117 Sun Aug 8 17:26:29 2004
+++ php-src/ext/standard/math.c Mon Sep 20 18:08:06 2004
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: math.c,v 1.117 2004/08/08 21:26:29 iliaa Exp $ */
+/* $Id: math.c,v 1.118 2004/09/20 22:08:06 wez Exp $ */
#include "php.h"
#include "php_math.h"
@@ -617,7 +617,6 @@
/* {{{ 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 @@
}
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
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
