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

diff --git a/include/stdio.h b/include/stdio.h
index 7d3130e2..f6488017 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -5,11 +5,7 @@
 extern "C" {
 #endif
 
-#if __STDC_VERSION__ >= 199901L
-#define __restrict restrict
-#elif !defined(__GNUC__)
-#define __restrict
-#endif
+#include <features.h>
 
 #define __NEED_FILE
 #define __NEED_va_list
@@ -24,12 +20,7 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
-#undef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void*)0)
-#endif
+#define NULL 0L
 
 #undef EOF
 #define EOF (-1)
@@ -178,15 +169,12 @@ int ferror_unlocked(FILE *);
 int fileno_unlocked(FILE *);
 int getw(FILE *);
 int putw(int, FILE *);
-#endif
-
-#ifdef _BSD_SOURCE
 char *fgetln(FILE *, size_t *);
+int asprintf(char **, const char *, ...);
+int vasprintf(char **, const char *, va_list);
 #endif
 
 #ifdef _GNU_SOURCE
-int asprintf(char **, const char *, ...);
-int vasprintf(char **, const char *, va_list);
 char *fgets_unlocked(char *, int, FILE *);
 int fputs_unlocked(const char *, FILE *);
 #endif