mingw-wsl-patches

Fork

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

diff --git a/wslapi/include/userenv.h b/wslapi/include/userenv.h
--- a/wslapi/include/userenv.h
+++ b/wslapi/include/userenv.h
@@ -1,14 +1,13 @@
 #ifndef _USERENV_H
 #define _USERENV_H
-#if __GNUC__ >=3
 #pragma GCC system_header
-#endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <windef.h>
+
+_BEGIN_C_DECLS
+
 #define PI_NOUI 	(1)
 #define PI_APPLYPOLICY	(2)
 #if (_WIN32_WINNT >= 0x0500)
 #define PT_TEMPORARY	(1)
 #define PT_ROAMING	(2)
@@ -80,9 +79,9 @@ typedef LPPROFILEINFOA LPPROFILEINFO;
 #define GetAllUsersProfileDirectory  GetAllUsersProfileDirectoryA
 #define GetDefaultUserProfileDirectory  GetDefaultUserProfileDirectoryA
 #define ExpandEnvironmentStringsForUser  ExpandEnvironmentStringsForUserA
 #endif
 #endif
-#ifdef __cplusplus
-}
-#endif
+
+_END_C_DECLS
+
 #endif /* _USERENV_H */