fix some obscure header type size/alignment issues

[musl] / include / wchar.h

diff --git a/include/wchar.h b/include/wchar.h
index b1c6b7f..9ceddd5 100644 (file)
--- a/include/wchar.h
+++ b/include/wchar.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
@@ -30,12 +26,7 @@ extern "C" {
 
 #include <bits/wchar.h>
 
-#undef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void*)0)
-#endif
+#define NULL 0L
 
 #undef WEOF
 #define WEOF (-1)