aboutsummaryrefslogtreecommitdiff
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
parentfbd01e6c4427b558b63fedb938b7fc5fada8c6b8 (diff)
downloadglibc-5226a81f5517bcbc892679cca792006a6bafc53f.zip
glibc-5226a81f5517bcbc892679cca792006a6bafc53f.tar.gz
glibc-5226a81f5517bcbc892679cca792006a6bafc53f.tar.bz2
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.
-rw-r--r--ChangeLog15
-rw-r--r--bits/dirent.h2
-rw-r--r--dirent/alphasort.c2
-rw-r--r--dirent/alphasort64.c2
-rw-r--r--dirent/scandir.c2
-rw-r--r--dirent/scandir64-tail.c2
-rw-r--r--dirent/scandir64.c2
-rw-r--r--dirent/scandirat.c2
-rw-r--r--dirent/scandirat64.c2
-rw-r--r--dirent/versionsort.c2
-rw-r--r--dirent/versionsort64.c2
-rw-r--r--include/dirent.h2
-rw-r--r--sysdeps/unix/sysv/linux/bits/dirent.h2
13 files changed, 29 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 92b86bf..42e167e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
2018-03-03 Adhemerval Zanella <adhemerval.zanella@linaro.org>
+ * 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.
diff --git a/bits/dirent.h b/bits/dirent.h
index 8c38b8c..d775540 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
diff --git a/dirent/alphasort.c b/dirent/alphasort.c
index 8d3b939..a6cd151 100644
--- a/dirent/alphasort.c
+++ b/dirent/alphasort.c
@@ -32,6 +32,6 @@ alphasort (const struct dirent **a, const struct dirent **b)
return strcoll ((*a)->d_name, (*b)->d_name);
}
-#ifdef _DIRENT_MATCHES_DIRENT64
+#if _DIRENT_MATCHES_DIRENT64
weak_alias (alphasort, alphasort64)
#endif
diff --git a/dirent/alphasort64.c b/dirent/alphasort64.c
index deb1921..3a47a97 100644
--- a/dirent/alphasort64.c
+++ b/dirent/alphasort64.c
@@ -19,7 +19,7 @@
#include <string.h>
/* alphasort.c defines alphasort64 as an alias if _DIRENT_MATCHES_DIRENT64. */
-#ifndef _DIRENT_MATCHES_DIRENT64
+#if !_DIRENT_MATCHES_DIRENT64
int
alphasort64 (const struct dirent64 **a, const struct dirent64 **b)
diff --git a/dirent/scandir.c b/dirent/scandir.c
index 977d645..b24e157 100644
--- a/dirent/scandir.c
+++ b/dirent/scandir.c
@@ -40,6 +40,6 @@ SCANDIR (const char *dir,
return SCANDIR_TAIL (__opendir (dir), namelist, select, cmp);
}
-#ifdef _DIRENT_MATCHES_DIRENT64
+#if _DIRENT_MATCHES_DIRENT64
weak_alias (scandir, scandir64)
#endif
diff --git a/dirent/scandir64-tail.c b/dirent/scandir64-tail.c
index 684088c..8d5cc07 100644
--- a/dirent/scandir64-tail.c
+++ b/dirent/scandir64-tail.c
@@ -18,7 +18,7 @@
#include <dirent.h>
-#ifndef _DIRENT_MATCHES_DIRENT64
+#if !_DIRENT_MATCHES_DIRENT64
# define SCANDIR_TAIL __scandir64_tail
# define READDIR __readdir64
# define DIRENT_TYPE struct dirent64
diff --git a/dirent/scandir64.c b/dirent/scandir64.c
index 7e666b0..0c63fa9 100644
--- a/dirent/scandir64.c
+++ b/dirent/scandir64.c
@@ -18,7 +18,7 @@
#include <dirent.h>
/* scandir.c defines scandir64 as an alias if _DIRENT_MATCHES_DIRENT64. */
-#ifndef _DIRENT_MATCHES_DIRENT64
+#if !_DIRENT_MATCHES_DIRENT64
# define SCANDIR scandir64
# define SCANDIR_TAIL __scandir64_tail
diff --git a/dirent/scandirat.c b/dirent/scandirat.c
index 3f63f4d..96a1b0e 100644
--- a/dirent/scandirat.c
+++ b/dirent/scandirat.c
@@ -44,6 +44,6 @@ libc_hidden_def (SCANDIRAT)
weak_alias (__scandirat, scandirat)
#endif
-#ifdef _DIRENT_MATCHES_DIRENT64
+#if _DIRENT_MATCHES_DIRENT64
weak_alias (scandirat, scandirat64)
#endif
diff --git a/dirent/scandirat64.c b/dirent/scandirat64.c
index 6d682ff..520ae7c 100644
--- a/dirent/scandirat64.c
+++ b/dirent/scandirat64.c
@@ -18,7 +18,7 @@
#include <dirent.h>
/* scandirat.c defines scandirat64 as an alias if _DIRENT_MATCHES_DIRENT64. */
-#ifndef _DIRENT_MATCHES_DIRENT64
+#if !_DIRENT_MATCHES_DIRENT64
# define SCANDIRAT scandirat64
# define SCANDIR_TAIL __scandir64_tail
diff --git a/dirent/versionsort.c b/dirent/versionsort.c
index 0130138..5ec15e8 100644
--- a/dirent/versionsort.c
+++ b/dirent/versionsort.c
@@ -32,6 +32,6 @@ versionsort (const struct dirent **a, const struct dirent **b)
return __strverscmp ((*a)->d_name, (*b)->d_name);
}
-#ifdef _DIRENT_MATCHES_DIRENT64
+#if _DIRENT_MATCHES_DIRENT64
weak_alias (versionsort, versionsort64)
#endif
diff --git a/dirent/versionsort64.c b/dirent/versionsort64.c
index bfb0cbb..7689c26 100644
--- a/dirent/versionsort64.c
+++ b/dirent/versionsort64.c
@@ -19,7 +19,7 @@
#include <string.h>
/* versionsort.c defines a versionsort64 alias if _DIRENT_MATCHES_DIRENT64. */
-#ifndef _DIRENT_MATCHES_DIRENT64
+#if !_DIRENT_MATCHES_DIRENT64
int
versionsort64 (const struct dirent64 **a, const struct dirent64 **b)
diff --git a/include/dirent.h b/include/dirent.h
index caaeb0b..cc8f189 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -57,7 +57,7 @@ extern int __scandir_tail (DIR *dp,
int (*cmp) (const struct dirent **,
const struct dirent **))
attribute_hidden;
-# ifdef _DIRENT_MATCHES_DIRENT64
+# if _DIRENT_MATCHES_DIRENT64
# define __scandir64_tail (dp, namelist, select, cmp) \
__scandir_tail (dp, (struct dirent ***) (namelist), \
(int (*) (const struct dirent *)) (select), \
diff --git a/sysdeps/unix/sysv/linux/bits/dirent.h b/sysdeps/unix/sysv/linux/bits/dirent.h
index 2ed7919..f312720 100644
--- a/sysdeps/unix/sysv/linux/bits/dirent.h
+++ b/sysdeps/unix/sysv/linux/bits/dirent.h
@@ -54,4 +54,6 @@ struct dirent64
#if defined __OFF_T_MATCHES_OFF64_T && defined __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