about summary refs log tree commit diff
path: root/sysdeps/ieee754/dbl-64/s_floor.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2012-01-27 15:06:37 -0500
committerUlrich Drepper <drepper@gmail.com>2012-01-27 15:06:37 -0500
commitcdd9b365f92e0f30d64094a8400dec2a7e494110 (patch)
tree78f21a4596953ac23f5c02eb1fb693e9412993d2 /sysdeps/ieee754/dbl-64/s_floor.c
parent6ee65ed6ddbf04402fad0bec6aa9c73b9d982ae4 (diff)
parent8db218828187d58575c509b6ed3da0cad9f73519 (diff)
downloadglibc-cdd9b365f92e0f30d64094a8400dec2a7e494110.tar.gz
glibc-cdd9b365f92e0f30d64094a8400dec2a7e494110.tar.xz
glibc-cdd9b365f92e0f30d64094a8400dec2a7e494110.zip
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
	ChangeLog
Diffstat (limited to 'sysdeps/ieee754/dbl-64/s_floor.c')
-rw-r--r--sysdeps/ieee754/dbl-64/s_floor.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/sysdeps/ieee754/dbl-64/s_floor.c b/sysdeps/ieee754/dbl-64/s_floor.c
index 8b2038e69d..139e2f5cb5 100644
--- a/sysdeps/ieee754/dbl-64/s_floor.c
+++ b/sysdeps/ieee754/dbl-64/s_floor.c
@@ -22,18 +22,9 @@
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __STDC__
 static const double huge = 1.0e300;
-#else
-static double huge = 1.0e300;
-#endif
 
-#ifdef __STDC__
-	double __floor(double x)
-#else
-	double __floor(x)
-	double x;
-#endif
+double __floor(double x)
 {
 	int32_t i0,i1,j0;
 	u_int32_t i,j;