X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=include%2Fstdio.h;h=f64880173d0effbfbadf5f854d80364c3a3ebd33;hp=9a2093763505dc9bbd6444dd86229a629ca6b8a1;hb=ae0c1de530bc3b27069008b8b247171d08dbe80b;hpb=c1a9658bd19245ff0fb52d3da567815d822fb622

diff --git a/include/stdio.h b/include/stdio.h
index 9a209376..f6488017 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -20,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)
@@ -174,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