Merge branch 'master' of ssh://sourceware.org/git/glibc

diff --git a/ChangeLog b/ChangeLog
index a969195ba74dbd6004b3f6aec6a6218d81b7b1ab..d36e8485b8e3efa713f34b0a9861a9ee3d8e22d1 100644 (file)
--- 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/s_catan.c: Add branch predictions.

diff --git a/math/s_nan.c b/math/s_nan.c
index 9b2c50558bf39e16687d677d55e7b19c404e8c9d..97f9d898a078d600b1bc207568f58210bb5034da 100644 (file)
--- 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 2e1b1eb9114b5b0fb04cbbade60439514dbb1ea8..6161bcdd29889967eb54cd73ac88d5bfcdf3c154 100644 (file)
--- 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 9709b9238383e7df5f16c4b5e05ba06117d70ac0..1db246426c1165db101ed5e7a20965cb7ad0297d 100644 (file)
--- 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 b6195f10be342073b82b7f67e569e4e98b83b5ed..db31e4f90e767c04e867192cc32c2487fcddaef3 100644 (file)
--- 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>