From: Andreas Schwab <schwab@linux-m68k.org>
Date: Sat, 22 Oct 2011 11:49:49 +0000 (+0200)
Subject: Fix compilation due to __nan defines
X-Git-Tag: glibc-2.15~192^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee2aafe08e68c88412b7dcfa4b1e0d11789348f8;p=thirdparty%2Fglibc.git

Fix compilation due to __nan defines
---

diff --git a/ChangeLog b/ChangeLog
index adc9025a84d..4d0651aa0d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-10-22  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* math/s_nan.c: Undef __nan.
+	* math/s_nanf.c: Undef __nanf.
+	* math/s_nanl.c: Undef __nanl.
+	* sysdeps/ieee754/ldbl-128ibm/s_atanl.c: Include <math.h> before
+	"math_private.h".
+
 2011-10-22  Ulrich Drepper  <drepper@gmail.com>
 
 	* math/math_private.h: Define __nan, __nanf, __nanl.
diff --git a/math/s_nan.c b/math/s_nan.c
index 9b2c50558bf..97f9d898a07 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 2e1b1eb9114..6161bcdd298 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 9709b923838..1db246426c1 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)
 {
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_atanl.c b/sysdeps/ieee754/ldbl-128ibm/s_atanl.c
index b6195f10be3..db31e4f90e7 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_atanl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_atanl.c
@@ -59,6 +59,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA */
 
 
+#include <math.h>
 #include "math_private.h"
 #include <math_ldbl_opt.h>