cvs: php4 /ext/standard math.c
| From: | Derick Rethans | Date: | Fri, 21 Dec 2001 16:38:50 +0000 |
| Subject: | cvs: php4 /ext/standard math.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-8751@lists.php.net to get a copy of this message | ||
derick Fri Dec 21 11:38:50 2001 EDT
Modified files:
/php4/ext/standard math.c
Log:
- Fix for bug #14646, floor() always returns a float now.
Index: php4/ext/standard/math.c
diff -u php4/ext/standard/math.c:1.67 php4/ext/standard/math.c:1.68
--- php4/ext/standard/math.c:1.67 Sun Dec 16 05:59:20 2001
+++ php4/ext/standard/math.c Fri Dec 21 11:38:49 2001
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: math.c,v 1.67 2001/12/16 10:59:20 derick Exp $ */
+/* $Id: math.c,v 1.68 2001/12/21 16:38:49 derick Exp $ */
#include "php.h"
#include "php_math.h"
@@ -82,7 +82,6 @@
/* }}} */
/* {{{ proto float floor(float number)
Returns the next lowest integer value from the number */
-
PHP_FUNCTION(floor)
{
zval **value;
@@ -96,7 +95,8 @@
if (Z_TYPE_PP(value) == IS_DOUBLE) {
RETURN_DOUBLE(floor(Z_DVAL_PP(value)));
} else if (Z_TYPE_PP(value) == IS_LONG) {
- RETURN_LONG(Z_LVAL_PP(value));
+ convert_to_double_ex(value);
+ RETURN_DOUBLE(Z_DVAL_PP(value));
}
RETURN_FALSE;