From 5226a81f5517bcbc892679cca792006a6bafc53f Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Fri, 2 Mar 2018 13:04:36 -0300 Subject: Define _DIRENT_MATCHES_DIRENT64 regardless This patch defines _DIRENT_MATCHES_DIRENT64 to either 0 or 1 and adjust its usage from checking its definition to its value. Checked on a build for major Linux abis. * bits/dirent.h (__INO_T_MATCHES_INO64_T): Define regardless whether __INO_T_MATCHES_INO64_T is defined. * sysdeps/unix/sysv/linux/bits/dirent.h: Likewise. * dirent/alphasort.c: Check _DIRENT_MATCHES_DIRENT64 value instead of definition. * dirent/alphasort64.c: Likewise. * dirent/scandir.c: Likewise. * dirent/scandir64-tail.c: Likewise. * dirent/scandir64.c: Likewise. * dirent/scandirat.c: Likewise. * dirent/scandirat64.c: Likewise. * dirent/versionsort.c: Likewise. * dirent/versionsort64.c: Likewise. * include/dirent.h: Likewise. --- ChangeLog | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 92b86bf609..42e167e18e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,20 @@ 2018-03-03 Adhemerval Zanella + * bits/dirent.h (__INO_T_MATCHES_INO64_T): Define regardless whether + __INO_T_MATCHES_INO64_T is defined. + * sysdeps/unix/sysv/linux/bits/dirent.h: Likewise. + * dirent/alphasort.c: Check _DIRENT_MATCHES_DIRENT64 value instead + of definition. + * dirent/alphasort64.c: Likewise. + * dirent/scandir.c: Likewise. + * dirent/scandir64-tail.c: Likewise. + * dirent/scandir64.c: Likewise. + * dirent/scandirat.c: Likewise. + * dirent/scandirat64.c: Likewise. + * dirent/versionsort.c: Likewise. + * dirent/versionsort64.c: Likewise. + * include/dirent.h: Likewise. + * nptl/tst-cancel4-common.h (set_socket_buffer): New function. * nptl/tst-cancel4-common.c (do_test): Call set_socket_buffer for socketpair endpoint. -- cgit 1.4.1