mingw-wsl-patches

Fork

Make <winnls.h> header effectively self-contained.

diff --git a/wslapi/include/winnls.h b/wslapi/include/winnls.h
--- a/wslapi/include/winnls.h
+++ b/wslapi/include/winnls.h
@@ -1,22 +1,20 @@
 #ifndef _WINNLS_H
 #define _WINNLS_H
-#if __GNUC__ >= 3
 #pragma GCC system_header
-#endif
+
+#include <winbase.h>
 
 #ifndef WINBASEAPI
 #ifdef __W32API_USE_DLLIMPORT__
 #define WINBASEAPI DECLSPEC_IMPORT
 #else
 #define WINBASEAPI
 #endif
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+_BEGIN_C_DECLS
 
 #define MAX_LEADBYTES 	12
 #define MAX_DEFAULTCHAR	2
 #define LOCALE_NOUSEROVERRIDE	0x80000000
 #define LOCALE_USE_CP_ACP	0x40000000
@@ -729,9 +727,9 @@ typedef LPNUMBERFMTA LPNUMBERFMT;
 #define EnumLanguageGroupLocales EnumLanguageGroupLocalesA
 #define EnumUILanguages EnumUILanguagesA
 #endif /* (WINVER >= 0x0500) */
 #endif /* UNICODE */
 #endif /* RC_INVOKED */
-#ifdef __cplusplus
-}
+
+_END_C_DECLS
+
 #endif
-#endif