mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-19 16:10:01 +00:00
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.
This commit is contained in:
parent
fbd01e6c44
commit
5226a81f55
15
ChangeLog
15
ChangeLog
@ -1,5 +1,20 @@
|
|||||||
2018-03-03 Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
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.h (set_socket_buffer): New function.
|
||||||
* nptl/tst-cancel4-common.c (do_test): Call set_socket_buffer
|
* nptl/tst-cancel4-common.c (do_test): Call set_socket_buffer
|
||||||
for socketpair endpoint.
|
for socketpair endpoint.
|
||||||
|
@ -56,4 +56,6 @@ struct dirent64
|
|||||||
#ifdef __INO_T_MATCHES_INO64_T
|
#ifdef __INO_T_MATCHES_INO64_T
|
||||||
/* Inform libc code that these two types are effectively identical. */
|
/* Inform libc code that these two types are effectively identical. */
|
||||||
# define _DIRENT_MATCHES_DIRENT64 1
|
# define _DIRENT_MATCHES_DIRENT64 1
|
||||||
|
#else
|
||||||
|
# define _DIRENT_MATCHES_DIRENT64 0
|
||||||
#endif
|
#endif
|
||||||
|
@ -32,6 +32,6 @@ alphasort (const struct dirent **a, const struct dirent **b)
|
|||||||
return strcoll ((*a)->d_name, (*b)->d_name);
|
return strcoll ((*a)->d_name, (*b)->d_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _DIRENT_MATCHES_DIRENT64
|
#if _DIRENT_MATCHES_DIRENT64
|
||||||
weak_alias (alphasort, alphasort64)
|
weak_alias (alphasort, alphasort64)
|
||||||
#endif
|
#endif
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
/* alphasort.c defines alphasort64 as an alias if _DIRENT_MATCHES_DIRENT64. */
|
/* alphasort.c defines alphasort64 as an alias if _DIRENT_MATCHES_DIRENT64. */
|
||||||
#ifndef _DIRENT_MATCHES_DIRENT64
|
#if !_DIRENT_MATCHES_DIRENT64
|
||||||
|
|
||||||
int
|
int
|
||||||
alphasort64 (const struct dirent64 **a, const struct dirent64 **b)
|
alphasort64 (const struct dirent64 **a, const struct dirent64 **b)
|
||||||
|
@ -40,6 +40,6 @@ SCANDIR (const char *dir,
|
|||||||
return SCANDIR_TAIL (__opendir (dir), namelist, select, cmp);
|
return SCANDIR_TAIL (__opendir (dir), namelist, select, cmp);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _DIRENT_MATCHES_DIRENT64
|
#if _DIRENT_MATCHES_DIRENT64
|
||||||
weak_alias (scandir, scandir64)
|
weak_alias (scandir, scandir64)
|
||||||
#endif
|
#endif
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
|
|
||||||
#ifndef _DIRENT_MATCHES_DIRENT64
|
#if !_DIRENT_MATCHES_DIRENT64
|
||||||
# define SCANDIR_TAIL __scandir64_tail
|
# define SCANDIR_TAIL __scandir64_tail
|
||||||
# define READDIR __readdir64
|
# define READDIR __readdir64
|
||||||
# define DIRENT_TYPE struct dirent64
|
# define DIRENT_TYPE struct dirent64
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
|
|
||||||
/* scandir.c defines scandir64 as an alias if _DIRENT_MATCHES_DIRENT64. */
|
/* scandir.c defines scandir64 as an alias if _DIRENT_MATCHES_DIRENT64. */
|
||||||
#ifndef _DIRENT_MATCHES_DIRENT64
|
#if !_DIRENT_MATCHES_DIRENT64
|
||||||
|
|
||||||
# define SCANDIR scandir64
|
# define SCANDIR scandir64
|
||||||
# define SCANDIR_TAIL __scandir64_tail
|
# define SCANDIR_TAIL __scandir64_tail
|
||||||
|
@ -44,6 +44,6 @@ libc_hidden_def (SCANDIRAT)
|
|||||||
weak_alias (__scandirat, scandirat)
|
weak_alias (__scandirat, scandirat)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _DIRENT_MATCHES_DIRENT64
|
#if _DIRENT_MATCHES_DIRENT64
|
||||||
weak_alias (scandirat, scandirat64)
|
weak_alias (scandirat, scandirat64)
|
||||||
#endif
|
#endif
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
|
|
||||||
/* scandirat.c defines scandirat64 as an alias if _DIRENT_MATCHES_DIRENT64. */
|
/* scandirat.c defines scandirat64 as an alias if _DIRENT_MATCHES_DIRENT64. */
|
||||||
#ifndef _DIRENT_MATCHES_DIRENT64
|
#if !_DIRENT_MATCHES_DIRENT64
|
||||||
|
|
||||||
# define SCANDIRAT scandirat64
|
# define SCANDIRAT scandirat64
|
||||||
# define SCANDIR_TAIL __scandir64_tail
|
# define SCANDIR_TAIL __scandir64_tail
|
||||||
|
@ -32,6 +32,6 @@ versionsort (const struct dirent **a, const struct dirent **b)
|
|||||||
return __strverscmp ((*a)->d_name, (*b)->d_name);
|
return __strverscmp ((*a)->d_name, (*b)->d_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _DIRENT_MATCHES_DIRENT64
|
#if _DIRENT_MATCHES_DIRENT64
|
||||||
weak_alias (versionsort, versionsort64)
|
weak_alias (versionsort, versionsort64)
|
||||||
#endif
|
#endif
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
/* versionsort.c defines a versionsort64 alias if _DIRENT_MATCHES_DIRENT64. */
|
/* versionsort.c defines a versionsort64 alias if _DIRENT_MATCHES_DIRENT64. */
|
||||||
#ifndef _DIRENT_MATCHES_DIRENT64
|
#if !_DIRENT_MATCHES_DIRENT64
|
||||||
|
|
||||||
int
|
int
|
||||||
versionsort64 (const struct dirent64 **a, const struct dirent64 **b)
|
versionsort64 (const struct dirent64 **a, const struct dirent64 **b)
|
||||||
|
@ -57,7 +57,7 @@ extern int __scandir_tail (DIR *dp,
|
|||||||
int (*cmp) (const struct dirent **,
|
int (*cmp) (const struct dirent **,
|
||||||
const struct dirent **))
|
const struct dirent **))
|
||||||
attribute_hidden;
|
attribute_hidden;
|
||||||
# ifdef _DIRENT_MATCHES_DIRENT64
|
# if _DIRENT_MATCHES_DIRENT64
|
||||||
# define __scandir64_tail (dp, namelist, select, cmp) \
|
# define __scandir64_tail (dp, namelist, select, cmp) \
|
||||||
__scandir_tail (dp, (struct dirent ***) (namelist), \
|
__scandir_tail (dp, (struct dirent ***) (namelist), \
|
||||||
(int (*) (const struct dirent *)) (select), \
|
(int (*) (const struct dirent *)) (select), \
|
||||||
|
@ -54,4 +54,6 @@ struct dirent64
|
|||||||
#if defined __OFF_T_MATCHES_OFF64_T && defined __INO_T_MATCHES_INO64_T
|
#if defined __OFF_T_MATCHES_OFF64_T && defined __INO_T_MATCHES_INO64_T
|
||||||
/* Inform libc code that these two types are effectively identical. */
|
/* Inform libc code that these two types are effectively identical. */
|
||||||
# define _DIRENT_MATCHES_DIRENT64 1
|
# define _DIRENT_MATCHES_DIRENT64 1
|
||||||
|
#else
|
||||||
|
# define _DIRENT_MATCHES_DIRENT64 0
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user