about summary refs log tree commit diff
path: root/src/math/remainderf.c
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-03-19 22:07:43 -0400
committerRich Felker <dalias@aerifal.cx>2012-03-19 22:07:43 -0400
commit97721a5508415a2f10eb068e022093811c9ff8be (patch)
tree88e9ce153895ad949576fa7ce1eeee4b02286479 /src/math/remainderf.c
parentacb744921b73f5a73803e533e5e4a4896d164a26 (diff)
parent0cbb65479147ecdaa664e88cc2a5a925f3de502f (diff)
downloadmusl-97721a5508415a2f10eb068e022093811c9ff8be.tar.gz
musl-97721a5508415a2f10eb068e022093811c9ff8be.tar.xz
musl-97721a5508415a2f10eb068e022093811c9ff8be.zip
Merge remote branch 'nsz/master'
Diffstat (limited to 'src/math/remainderf.c')
-rw-r--r--src/math/remainderf.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/math/remainderf.c b/src/math/remainderf.c
index 61c3c660..77671039 100644
--- a/src/math/remainderf.c
+++ b/src/math/remainderf.c
@@ -15,8 +15,6 @@
 
 #include "libm.h"
 
-static const float zero = 0.0;
-
 float remainderf(float x, float p)
 {
 	int32_t hx,hp;
@@ -30,16 +28,13 @@ float remainderf(float x, float p)
 	hx &= 0x7fffffff;
 
 	/* purge off exception values */
-	if (hp == 0)  /* p = 0 */
+	if (hp == 0 || hx >= 0x7f800000 || hp > 0x7f800000)  /* p = 0, x not finite, p is NaN */
 		return (x*p)/(x*p);
-	if (hx >= 0x7f800000 || hp > 0x7f800000)  /* x not finite, p is NaN */
-		// FIXME: why long double?
-		return ((long double)x*p)/((long double)x*p);
 
 	if (hp <= 0x7effffff)
 		x = fmodf(x, p + p);  /* now x < 2p */
 	if (hx - hp == 0)
-		return zero*x;
+		return 0.0f*x;
 	x = fabsf(x);
 	p = fabsf(p);
 	if (hp < 0x01000000) {