Fix configure test for sendfile()

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

From-SVN: r236730
This commit is contained in:
Jonathan Wakely 2016-05-25 17:13:52 +01:00 committed by Jonathan Wakely
parent 5c42d34143
commit c42d228806
4 changed files with 9 additions and 5 deletions

View File

@ -1,5 +1,9 @@
2016-05-25 Jonathan Wakely <jwakely@redhat.com> 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/c++config (_GLIBCXX14_USE_CONSTEXPR): Remove it.
* include/bits/hashtable_policy.h (_Power2_rehash_policy::_M_next_bkt): * include/bits/hashtable_policy.h (_Power2_rehash_policy::_M_next_bkt):
Remove const qualification on function. Replace Remove const qualification on function. Replace

View File

@ -4373,7 +4373,7 @@ dnl
gnu* | linux* | solaris*) gnu* | linux* | solaris*)
GCC_TRY_COMPILE_OR_LINK( GCC_TRY_COMPILE_OR_LINK(
[#include <sys/sendfile.h>], [#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=yes],
[glibcxx_cv_sendfile=no]) [glibcxx_cv_sendfile=no])
;; ;;
@ -4383,7 +4383,7 @@ dnl
esac esac
]) ])
if test $glibcxx_cv_sendfile = yes; then 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 fi
AC_MSG_RESULT($glibcxx_cv_sendfile) AC_MSG_RESULT($glibcxx_cv_sendfile)
dnl dnl

View File

@ -937,7 +937,7 @@
/* Define if _SC_NPROC_ONLN is available in <unistd.h>. */ /* Define if _SC_NPROC_ONLN is available in <unistd.h>. */
#undef _GLIBCXX_USE_SC_NPROC_ONLN #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 #undef _GLIBCXX_USE_SENDFILE
/* Define if struct stat has timespec members. */ /* Define if struct stat has timespec members. */

View File

@ -80358,7 +80358,7 @@ else
int int
main () main ()
{ {
sendfile(1, 2, (off_t*)NULL, sizeof 1); sendfile(1, 2, (off_t*)0, sizeof 1);
; ;
return 0; return 0;
} }
@ -80379,7 +80379,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
int int
main () main ()
{ {
sendfile(1, 2, (off_t*)NULL, sizeof 1); sendfile(1, 2, (off_t*)0, sizeof 1);
; ;
return 0; return 0;
} }