X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=include%2Fdirent.h;h=d445f80a26b7f112528f93fa8637f966f73d9b39;hp=b6261595a7420a0fc0b0cfbd29af00c0cf08d282;hb=1ab59de81e94e7802f85d314a709f8350a0e9b65;hpb=400c5e5c8307a2ebe44ef1f203f5a15669f20347

diff --git a/include/dirent.h b/include/dirent.h
index b6261595..d445f80a 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -5,15 +5,11 @@
 extern "C" {
 #endif
 
-#if __STDC_VERSION__ >= 199901L
-#define __restrict restrict
-#elif !defined(__GNUC__)
-#define __restrict
-#endif
+#include <features.h>
 
 #define __NEED_ino_t
 #define __NEED_off_t
-#ifdef _BSD_SOURCE
+#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
 #define __NEED_size_t
 #endif
 
@@ -57,16 +53,13 @@ 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)
 #define dirent64 dirent
 #define readdir64 readdir
@@ -76,10 +69,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
 }