about summary refs log tree commit diff
path: root/math
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-10-22 13:18:08 -0400
committerUlrich Drepper <drepper@gmail.com>2011-10-22 13:18:08 -0400
commitdbc36f153e7f35d8c890871528438bb8ade99886 (patch)
tree4e9afb35c6f9f49da5c5e56f2241de031fbd83d9 /math
parent77425c63e72bc0c01d81bc7e9ba4bb41d11679e6 (diff)
parentee2aafe08e68c88412b7dcfa4b1e0d11789348f8 (diff)
downloadglibc-dbc36f153e7f35d8c890871528438bb8ade99886.tar.gz
glibc-dbc36f153e7f35d8c890871528438bb8ade99886.tar.xz
glibc-dbc36f153e7f35d8c890871528438bb8ade99886.zip
Merge branch 'master' of ssh://sourceware.org/git/glibc
Diffstat (limited to 'math')
-rw-r--r--math/s_nan.c1
-rw-r--r--math/s_nanf.c1
-rw-r--r--math/s_nanl.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/math/s_nan.c b/math/s_nan.c
index 9b2c50558b..97f9d898a0 100644
--- a/math/s_nan.c
+++ b/math/s_nan.c
@@ -25,6 +25,7 @@
 #include <ieee754.h>
 
 
+#undef __nan
 double
 __nan (const char *tagp)
 {
diff --git a/math/s_nanf.c b/math/s_nanf.c
index 2e1b1eb911..6161bcdd29 100644
--- a/math/s_nanf.c
+++ b/math/s_nanf.c
@@ -25,6 +25,7 @@
 #include <ieee754.h>
 
 
+#undef __nanf
 float
 __nanf (const char *tagp)
 {
diff --git a/math/s_nanl.c b/math/s_nanl.c
index 9709b92383..1db246426c 100644
--- a/math/s_nanl.c
+++ b/math/s_nanl.c
@@ -25,6 +25,7 @@
 #include <ieee754.h>
 
 
+#undef __nanl
 long double
 __nanl (const char *tagp)
 {