mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-27 03:33:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Define _DIRENT_MATCHES_DIRENT64 regardless

Browse Source 
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:
Adhemerval Zanella 2018-03-02 13:04:36 -03:00
parent fbd01e6c44
commit 5226a81f55
13 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -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.

2
bits/dirent.h
View 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

2
dirent/alphasort.c
View 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

2
dirent/alphasort64.c
View 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)

2
dirent/scandir.c
View 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

2
dirent/scandir64-tail.c
View 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

2
dirent/scandir64.c
View 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

2
dirent/scandirat.c
View 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

2
dirent/scandirat64.c
View 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

2
dirent/versionsort.c
View 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

2
dirent/versionsort64.c
View 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)

2
include/dirent.h
View 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), \

2
sysdeps/unix/sysv/linux/bits/dirent.h
View 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