about summary refs log tree commit diff
path: root/bits
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2018-03-02 13:04:36 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2018-03-05 18:10:04 -0300
commit5226a81f5517bcbc892679cca792006a6bafc53f (patch)
tree38c30f62363827b8c16d58b1c16db5f00b26ec13 /bits
parentfbd01e6c4427b558b63fedb938b7fc5fada8c6b8 (diff)
downloadglibc-5226a81f5517bcbc892679cca792006a6bafc53f.tar.gz
glibc-5226a81f5517bcbc892679cca792006a6bafc53f.tar.xz
glibc-5226a81f5517bcbc892679cca792006a6bafc53f.zip
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.
Diffstat (limited to 'bits')
-rw-r--r--bits/dirent.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/bits/dirent.h b/bits/dirent.h
index 8c38b8c758..d775540a13 100644
--- a/bits/dirent.h
+++ b/bits/dirent.h
@@ -56,4 +56,6 @@ struct dirent64
 #ifdef __INO_T_MATCHES_INO64_T
 /* Inform libc code that these two types are effectively identical.  */
 # define _DIRENT_MATCHES_DIRENT64	1
+#else
+# define _DIRENT_MATCHES_DIRENT64	0
 #endif