diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-10-22 13:18:08 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-10-22 13:18:08 -0400 |
| commit | dbc36f153e7f35d8c890871528438bb8ade99886 (patch) | |
| tree | 4e9afb35c6f9f49da5c5e56f2241de031fbd83d9 | |
| parent | 77425c63e72bc0c01d81bc7e9ba4bb41d11679e6 (diff) | |
| parent | ee2aafe08e68c88412b7dcfa4b1e0d11789348f8 (diff) | |
| download | glibc-dbc36f153e7f35d8c890871528438bb8ade99886.tar.gz glibc-dbc36f153e7f35d8c890871528438bb8ade99886.tar.xz glibc-dbc36f153e7f35d8c890871528438bb8ade99886.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | math/s_nan.c | 1 | ||||
| -rw-r--r-- | math/s_nanf.c | 1 | ||||
| -rw-r--r-- | math/s_nanl.c | 1 | ||||
| -rw-r--r-- | sysdeps/ieee754/ldbl-128ibm/s_atanl.c | 1 |
5 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index a969195ba7..d36e8485b8 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/s_catan.c: Add branch predictions. 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) { diff --git a/sysdeps/ieee754/ldbl-128ibm/s_atanl.c b/sysdeps/ieee754/ldbl-128ibm/s_atanl.c index b6195f10be..db31e4f90e 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> |