X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Fdirent.h;h=2d8fffb23f001d9cdffbebf7008dad4ea48f095b;hb=0ab97350f01b42de0f9fd811ee08653169661859;hp=726067f6afa49f4c856e6647e346b2a011c134fa;hpb=c1a9658bd19245ff0fb52d3da567815d822fb622;p=musl

diff --git a/include/dirent.h b/include/dirent.h
index 726067f6..2d8fffb2 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -9,22 +9,15 @@ extern "C" {
 
 #define __NEED_ino_t
 #define __NEED_off_t
-#ifdef _BSD_SOURCE
+#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
 #define __NEED_size_t
 #endif
 
 #include <bits/alltypes.h>
 
-typedef struct __DIR_s DIR;
+#include <bits/dirent.h>
 
-struct dirent
-{
-	ino_t d_ino;
-	off_t d_off;
-	unsigned short d_reclen;
-	unsigned char d_type;
-	char d_name[256];
-};
+typedef struct __dirstream DIR;
 
 #define d_fileno d_ino
 
@@ -34,13 +27,16 @@ 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(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+void           seekdir(DIR *, long);
+long           telldir(DIR *);
+#endif
+
 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 #define DT_UNKNOWN 0
 #define DT_FIFO 1
@@ -53,17 +49,14 @@ int scandir(const char *, struct dirent ***, int (*)(const struct dirent *), int
 #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
 
-#ifdef _BSD_SOURCE
-int getdents(int, struct dirent *, size_t);
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
+#if defined(_LARGEFILE64_SOURCE)
 #define dirent64 dirent
 #define readdir64 readdir
 #define readdir64_r readdir_r
@@ -72,10 +65,8 @@ int getdents(int, struct dirent *, size_t);
 #define versionsort64 versionsort
 #define off64_t off_t
 #define ino64_t ino_t
-#ifdef _BSD_SOURCE
 #define getdents64 getdents
 #endif
-#endif
 
 #ifdef __cplusplus
 }