mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-03 10:21:05 +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.
60 lines
1.7 KiB
C
60 lines
1.7 KiB
C
/* Copyright (C) 1996-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/>. */
|
|
|
|
#ifndef _DIRENT_H
|
|
# error "Never use <bits/dirent.h> directly; include <dirent.h> instead."
|
|
#endif
|
|
|
|
struct dirent
|
|
{
|
|
#ifndef __USE_FILE_OFFSET64
|
|
__ino_t d_ino;
|
|
__off_t d_off;
|
|
#else
|
|
__ino64_t d_ino;
|
|
__off64_t d_off;
|
|
#endif
|
|
unsigned short int d_reclen;
|
|
unsigned char d_type;
|
|
char d_name[256]; /* We must not include limits.h! */
|
|
};
|
|
|
|
#ifdef __USE_LARGEFILE64
|
|
struct dirent64
|
|
{
|
|
__ino64_t d_ino;
|
|
__off64_t d_off;
|
|
unsigned short int d_reclen;
|
|
unsigned char d_type;
|
|
char d_name[256]; /* We must not include limits.h! */
|
|
};
|
|
#endif
|
|
|
|
#define d_fileno d_ino /* Backwards compatibility. */
|
|
|
|
#undef _DIRENT_HAVE_D_NAMLEN
|
|
#define _DIRENT_HAVE_D_RECLEN
|
|
#define _DIRENT_HAVE_D_OFF
|
|
#define _DIRENT_HAVE_D_TYPE
|
|
|
|
#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
|