mingw-wsl-patches

Fork

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

diff --git a/wslapi/include/lmsvc.h b/wslapi/include/lmsvc.h
--- a/wslapi/include/lmsvc.h
+++ b/wslapi/include/lmsvc.h
@@ -1,14 +1,13 @@
 #ifndef _LMSVC_H
 #define _LMSVC_H
-#if __GNUC__ >=3
 #pragma GCC system_header
-#endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <lmcons.h>
+
+_BEGIN_C_DECLS
+
 #include <lmsname.h>
 #define SERVICE_DOS_ENCRYPTION TEXT("ENCRYPT")
 #define SERVICE_UNINSTALLED 0
 #define SERVICE_INSTALL_PENDING 1
 #define SERVICE_UNINSTALL_PENDING 2
@@ -126,9 +125,9 @@ NET_API_STATUS WINAPI NetServiceInstall(
 #define SERVICE_IP_CODE(t,n) ((long)SERVICE_IP_QUERY_HINT|(long)(n|(t<<SERVICE_IP_WAITTIME_SHIFT)))
 #define SERVICE_CCP_CODE(t,n) ((long)SERVICE_CCP_QUERY_HINT|(long)(n|(t<<SERVICE_IP_WAITTIME_SHIFT)))
 #define SERVICE_UIC_CODE(c,m) ((long)(((long)c<<16)|(long)(USHORT)m))
 #define SERVICE_NT_CCP_CODE(t,n) (((long)SERVICE_CCP_QUERY_HINT)|((long)(n))|(((t)&LOWER_HINT_MASK)<<SERVICE_IP_WAITTIME_SHIFT)|(((t)&UPPER_HINT_MASK)<<SERVICE_NTIP_WAITTIME_SHIFT))
 #define SERVICE_NT_WAIT_GET(c) ((((c)&UPPER_GET_HINT_MASK)>>SERVICE_NTIP_WAITTIME_SHIFT)|(((c)&LOWER_GET_HINT_MASK)>>SERVICE_IP_WAITTIME_SHIFT))
-#ifdef __cplusplus
-}
+
+_END_C_DECLS
+
 #endif
-#endif