]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
Define _DIRENT_MATCHES_DIRENT64 regardless
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>
Fri, 2 Mar 2018 16:04:36 +0000 (13:04 -0300)
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>
Mon, 5 Mar 2018 21:10:04 +0000 (18:10 -0300)
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.

13 files changed:
ChangeLog
bits/dirent.h
dirent/alphasort.c
dirent/alphasort64.c
dirent/scandir.c
dirent/scandir64-tail.c
dirent/scandir64.c
dirent/scandirat.c
dirent/scandirat64.c
dirent/versionsort.c
dirent/versionsort64.c
include/dirent.h
sysdeps/unix/sysv/linux/bits/dirent.h

index 92b86bf609db5af061d248a6d9e2cc4ff01bec96..42e167e18ed69803423c260121b2499c40c242e5 100644 (file)
--- 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.
index 8c38b8c7586d0deac6e7782e0803df85445331ed..d775540a13de036fca41c2b3a5a8f449a66befe5 100644 (file)
@@ -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
index 8d3b939e98279d85041016a2f860cb75570ff0e7..a6cd151bd1cdd22b6054856c18a5bae392056e25 100644 (file)
@@ -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
index deb19217a5616451b28f344f89749f7a777cbf84..3a47a97bb5f9fc8575e39a958c736056bb262d1e 100644 (file)
@@ -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)
index 977d6453d1096f58c22ec4d93606e6b30913957b..b24e15724c68af4e77252a92988bd0058b834e7f 100644 (file)
@@ -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
index 684088ce80ab31f8b6b649668bf510e80f19575c..8d5cc07748963316a47c6081e846fae27b9b8cff 100644 (file)
@@ -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
index 7e666b0f408a8a20f9cd4ad36168fbd63de8423e..0c63fa97ef40c21ce3c7701e7713c3e78f1b54c1 100644 (file)
@@ -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
index 3f63f4d19388dd87f14c91a2a725df7d939bf84b..96a1b0ed3033a076cc4337f1ad270b2f47752997 100644 (file)
@@ -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
index 6d682ff1812185a9892a087dd60936755e9f0943..520ae7cad7d7d89e52d70d80ac87c6d3daed8135 100644 (file)
@@ -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
index 013013809ba5afd849e642baf3a666411c509b2a..5ec15e83e9e412e48409beb5d6c2ca1e9be5b0c0 100644 (file)
@@ -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
index bfb0cbbb54989e18f58b4d8b651704ad1e5e8e34..7689c268a57804385d6dd069dc107353abadd96b 100644 (file)
@@ -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)
index caaeb0be85f0ad75610b7126375d77452b1bde4d..cc8f1895dfd79d12929367b615f3e951c2548e7c 100644 (file)
@@ -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),   \
index 2ed7919c3bf62a4df12983423d89438a052d8e19..f312720547a97cfcfed17853afed165d96d668d6 100644 (file)
@@ -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