diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 3 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9da31bc..d94f6d4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2017-03-10 George Lander <george.lander@arm.com> + + * acinclude.m4 (glibcxx_cv_obsolete_isnan): Define + _GLIBCXX_INCLUDE_NEXT_C_HEADERS before including math.h. + * configure: Regenerate. + 2017-03-09 Jonathan Wakely <jwakely@redhat.com> * include/std/functional (_Not_fn): Define macro to simplify diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index d9859aa..5998fe6 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -2297,7 +2297,8 @@ AC_DEFUN([GLIBCXX_CHECK_MATH11_PROTO], [ AC_MSG_CHECKING([for obsolete isnan function in <math.h>]) AC_CACHE_VAL(glibcxx_cv_obsolete_isnan, [ AC_COMPILE_IFELSE([AC_LANG_SOURCE( - [#include <math.h> + [#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS + #include <math.h> #undef isnan namespace std { using ::isnan; diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 9bb9862..29456c4 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -18390,6 +18390,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS #include <math.h> #undef isnan namespace std { |