Fix configure test for sendfile()

Backport from mainline
2016-05-25  Jonathan Wakely  <jwakely@redhat.com>

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

From-SVN: r243603

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9e5134aa4497f1d3dd2ad5858a22086991243a21..abaaf31e18a549b6092ce11e129a4d4ba48df3bf 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2016-12-13  Jonathan Wakely  <jwakely@redhat.com>
+
+       Backport from mainline
+       2016-05-25  Jonathan Wakely  <jwakely@redhat.com>
+
+       * acinclude.m4 (GLIBCXX_CHECK_FILESYSTEM_DEPS): Fix test for sendfile.
+       * configure: Regenerate.
+       * config.h.in: Regenerate.
+
 2016-12-12  Jonathan Wakely  <jwakely@redhat.com>
 
        Backport from mainline

diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 8ae843b7b44da72778a1d7b7379dc54844c2ac97..f7ecf9b7cbae9a63cd4f628480c0bb17438bc4bf 100644 (file)
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -4159,7 +4159,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])
         ;;
@@ -4169,7 +4169,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 0b85f6f482c149c37a12f10c8ab8727dee1d4892..8039504aa8b178a4e8bf17cf1389cf75b7d484d5 100644 (file)
--- a/libstdc++-v3/config.h.in
+++ b/libstdc++-v3/config.h.in
@@ -891,7 +891,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 83dd706cb6a8d95bd6cb7e3ca13bf7cd3bb43276..24eb78ea0b00a97568155c654a009bb40e957fc5 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -79462,7 +79462,7 @@ else
 int
 main ()
 {
-sendfile(1, 2, (off_t*)NULL, sizeof 1);
+sendfile(1, 2, (off_t*)0, sizeof 1);
   ;
   return 0;
 }
@@ -79483,7 +79483,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;
 }