mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 06:50:07 +00:00
5226a81f55
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.
50 lines
1.6 KiB
C
50 lines
1.6 KiB
C
/* Copyright (C) 1992-2018 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/* We need to avoid the header declaration of scandir64, because
|
|
the types don't match scandir and then the compiler will
|
|
complain about the mismatch when we do the alias below. */
|
|
#define scandirat64 __renamed_scandirat64
|
|
|
|
#include <dirent.h>
|
|
|
|
#undef scandirat64
|
|
|
|
#ifndef SCANDIRAT
|
|
# define SCANDIRAT __scandirat
|
|
# define SCANDIR_TAIL __scandir_tail
|
|
# define DIRENT_TYPE struct dirent
|
|
# define SCANDIRAT_WEAK_ALIAS
|
|
#endif
|
|
|
|
int
|
|
SCANDIRAT (int dfd, const char *dir,
|
|
DIRENT_TYPE ***namelist,
|
|
int (*select) (const DIRENT_TYPE *),
|
|
int (*cmp) (const DIRENT_TYPE **, const DIRENT_TYPE **))
|
|
{
|
|
return SCANDIR_TAIL (__opendirat (dfd, dir), namelist, select, cmp);
|
|
}
|
|
libc_hidden_def (SCANDIRAT)
|
|
#ifdef SCANDIRAT_WEAK_ALIAS
|
|
weak_alias (__scandirat, scandirat)
|
|
#endif
|
|
|
|
#if _DIRENT_MATCHES_DIRENT64
|
|
weak_alias (scandirat, scandirat64)
|
|
#endif
|