diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 4 | ||||
| -rw-r--r-- | libstdc++-v3/config.h.in | 2 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 358341b..e75d551 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2016-05-25 Jonathan Wakely <jwakely@redhat.com> + * acinclude.m4 (GLIBCXX_CHECK_FILESYSTEM_DEPS): Fix test for sendfile. + * configure: Regenerate. + * config.h.in: Regenerate. + * include/bits/c++config (_GLIBCXX14_USE_CONSTEXPR): Remove it. * include/bits/hashtable_policy.h (_Power2_rehash_policy::_M_next_bkt): Remove const qualification on function. Replace diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index b0f88cb..0824243 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -4373,7 +4373,7 @@ dnl gnu* | linux* | solaris*) GCC_TRY_COMPILE_OR_LINK( [#include <sys/sendfile.h>], - [sendfile(1, 2, (off_t*)NULL, sizeof 1);], + [sendfile(1, 2, (off_t*)0, sizeof 1);], [glibcxx_cv_sendfile=yes], [glibcxx_cv_sendfile=no]) ;; @@ -4383,7 +4383,7 @@ dnl esac ]) if test $glibcxx_cv_sendfile = yes; then - AC_DEFINE(_GLIBCXX_USE_SENDFILE, 1, [Define if sendfile is available in <sys/stat.h>.]) + AC_DEFINE(_GLIBCXX_USE_SENDFILE, 1, [Define if sendfile is available in <sys/sendfile.h>.]) fi AC_MSG_RESULT($glibcxx_cv_sendfile) dnl diff --git a/libstdc++-v3/config.h.in b/libstdc++-v3/config.h.in index 701d479..5ac2df4 100644 --- a/libstdc++-v3/config.h.in +++ b/libstdc++-v3/config.h.in @@ -937,7 +937,7 @@ /* Define if _SC_NPROC_ONLN is available in <unistd.h>. */ #undef _GLIBCXX_USE_SC_NPROC_ONLN -/* Define if sendfile is available in <sys/stat.h>. */ +/* Define if sendfile is available in <sys/sendfile.h>. */ #undef _GLIBCXX_USE_SENDFILE /* Define if struct stat has timespec members. */ diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 41797a9..4e81166 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -80358,7 +80358,7 @@ else int main () { -sendfile(1, 2, (off_t*)NULL, sizeof 1); +sendfile(1, 2, (off_t*)0, sizeof 1); ; return 0; } @@ -80379,7 +80379,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int main () { -sendfile(1, 2, (off_t*)NULL, sizeof 1); +sendfile(1, 2, (off_t*)0, sizeof 1); ; return 0; } |