Fix configure test for sendfile()

	* acinclude.m4 (GLIBCXX_CHECK_FILESYSTEM_DEPS): Fix test for sendfile.
	* configure: Regenerate.
	* config.h.in: Regenerate.

From-SVN: r236730

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 358341b096fc1a753e3f83cbcc2afec8f058e0c5..e75d551a800c7e7a36cd597525f5653b57c737ee 100644 (file)
--- 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 b0f88cbb4040f1417d2f0d734083667412b8ef76..0824243ced9c5a73676974359f355dbb7bc35713 100644 (file)
--- 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 701d4796d389a0e895d5cc7e2404f82bff5a3c5d..5ac2df4d8a840e26ea5b9ca1baedd69ab1d72a8b 100644 (file)
--- 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 41797a971b536fa06dc4b6d4733f75e6aef2d6a3..4e811665a8049783e2964d570855f3c67156f2ae 100755 (executable)
--- 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;
 }