mirror of
git://git.musl-libc.org/musl
synced 2024-12-27 01:02:12 +00:00
9448b0513e
the arch-specific bits/alltypes.h.sh has been replaced with a generic alltypes.h.in and minimal arch-specific bits/alltypes.h.in. this commit is intended to have no functional changes except: - exposing additional symbols that POSIX allows but does not require - changing the C++ name mangling for some types - fixing the signedness of blksize_t on powerpc (POSIX requires signed) - fixing the limit macros for sig_atomic_t on x86_64 - making dev_t an unsigned type (ABI matching goal, and more logical) in addition, some types that were wrongly defined with long on 32-bit archs were changed to int, and vice versa; this change is non-functional except for the possibility of making pointer types mismatch, and only affects programs that were using them incorrectly, and only at build-time, not runtime. the following changes were made in the interest of moving non-arch-specific types out of the alltypes system and into the headers they're associated with, and also will tend to improve application compatibility: - netdb.h now includes netinet/in.h (for socklen_t and uint32_t) - netinet/in.h now includes sys/socket.h and inttypes.h - sys/resource.h now includes sys/time.h (for struct timeval) - sys/wait.h now includes signal.h (for siginfo_t) - langinfo.h now includes nl_types.h (for nl_item) for the types in stdint.h: - types which are of no interest to other headers were moved out of the alltypes system. - fast types for 8- and 64-bit are hard-coded (at least for now); only the 16- and 32-bit ones have reason to vary by arch. and the following types have been changed for C++ ABI purposes; - mbstate_t now has a struct tag, __mbstate_t - FILE's struct tag has been changed to _IO_FILE - DIR's struct tag has been changed to __dirstream - locale_t's struct tag has been changed to __locale_struct - pthread_t is defined as unsigned long in C++ mode only - fpos_t now has a struct tag, _G_fpos64_t - fsid_t's struct tag has been changed to __fsid_t - idtype_t has been made an enum type (also required by POSIX) - nl_catd has been changed from long to void * - siginfo_t's struct tag has been removed - sigset_t's has been given a struct tag, __sigset_t - stack_t has been given a struct tag, sigaltstack - suseconds_t has been changed to long on 32-bit archs - [u]intptr_t have been changed from long to int rank on 32-bit archs - dev_t has been made unsigned summary of tests that have been performed against these changes: - nsz's libc-test (diff -u before and after) - C++ ABI check symbol dump (diff -u before, after, glibc) - grepped for __NEED, made sure types needed are still in alltypes - built gcc 3.4.6
80 lines
1.7 KiB
C
80 lines
1.7 KiB
C
#ifndef _DIRENT_H
|
|
#define _DIRENT_H
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#include <features.h>
|
|
|
|
#define __NEED_ino_t
|
|
#define __NEED_off_t
|
|
#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
|
|
#define __NEED_size_t
|
|
#endif
|
|
|
|
#include <bits/alltypes.h>
|
|
|
|
typedef struct __dirstream DIR;
|
|
|
|
struct dirent
|
|
{
|
|
ino_t d_ino;
|
|
off_t d_off;
|
|
unsigned short d_reclen;
|
|
unsigned char d_type;
|
|
char d_name[256];
|
|
};
|
|
|
|
#define d_fileno d_ino
|
|
|
|
int closedir(DIR *);
|
|
DIR *fdopendir(int);
|
|
DIR *opendir(const char *);
|
|
struct dirent *readdir(DIR *);
|
|
int readdir_r(DIR *__restrict, struct dirent *__restrict, struct dirent **__restrict);
|
|
void rewinddir(DIR *);
|
|
void seekdir(DIR *, long);
|
|
long telldir(DIR *);
|
|
int dirfd(DIR *);
|
|
|
|
int alphasort(const struct dirent **, const struct dirent **);
|
|
int scandir(const char *, struct dirent ***, int (*)(const struct dirent *), int (*)(const struct dirent **, const struct dirent **));
|
|
|
|
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
|
|
#define DT_UNKNOWN 0
|
|
#define DT_FIFO 1
|
|
#define DT_CHR 2
|
|
#define DT_DIR 4
|
|
#define DT_BLK 6
|
|
#define DT_REG 8
|
|
#define DT_LNK 10
|
|
#define DT_SOCK 12
|
|
#define DT_WHT 14
|
|
#define IFTODT(x) ((x)>>12 & 017)
|
|
#define DTTOIF(x) ((x)<<12)
|
|
int getdents(int, struct dirent *, size_t);
|
|
#endif
|
|
|
|
#ifdef _GNU_SOURCE
|
|
int versionsort(const struct dirent **, const struct dirent **);
|
|
#endif
|
|
|
|
#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
|
|
#define dirent64 dirent
|
|
#define readdir64 readdir
|
|
#define readdir64_r readdir_r
|
|
#define scandir64 scandir
|
|
#define alphasort64 alphasort
|
|
#define versionsort64 versionsort
|
|
#define off64_t off_t
|
|
#define ino64_t ino_t
|
|
#define getdents64 getdents
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif
|