diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4d4b2c46668..2e6e52fa74a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2017-03-15 Jonathan Wakely + + * acinclude.m4 (GLIBCXX_CHECK_S_ISREG_OR_S_IFREG): Fix typo in + comment. + * config.h.in: Regenerate. + * configure: Regenerate. + * doc/Makefile.in: Regenerate. + 2017-03-14 Jonathan Wakely PR libstdc++/79162 diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 5998fe6fdee..8cb525b2938 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -397,7 +397,7 @@ AC_DEFUN([GLIBCXX_CHECK_S_ISREG_OR_S_IFREG], [ res=no if test $glibcxx_cv_S_ISREG = yes; then AC_DEFINE(HAVE_S_ISREG, 1, - [Define if S_IFREG is available in .]) + [Define if S_ISREG is available in .]) res=S_ISREG elif test $glibcxx_cv_S_IFREG = yes; then AC_DEFINE(HAVE_S_IFREG, 1, diff --git a/libstdc++-v3/config.h.in b/libstdc++-v3/config.h.in index 51b770dd1dd..f1527d9938b 100644 --- a/libstdc++-v3/config.h.in +++ b/libstdc++-v3/config.h.in @@ -454,7 +454,7 @@ /* Define if S_IFREG is available in . */ #undef HAVE_S_IFREG -/* Define if S_IFREG is available in . */ +/* Define if S_ISREG is available in . */ #undef HAVE_S_ISREG /* Define to 1 if you have the `tanf' function. */ diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 29456c4421e..2406cb9d946 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -18391,7 +18391,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _GLIBCXX_INCLUDE_NEXT_C_HEADERS -#include + #include #undef isnan namespace std { using ::isnan; diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in index 281394debd0..be212b4ca62 100644 --- a/libstdc++-v3/doc/Makefile.in +++ b/libstdc++-v3/doc/Makefile.in @@ -539,7 +539,6 @@ xml_image_generated = \ ${xml_image_dir}/pbds_tree_text_lor_find.png xml_images = ${xml_image_basic} ${xml_image_generated} - xml_noinst = \ ${xml_dir}/book.txml \ ${xml_dir}/chapter.txml \