mingw-wsl-patches

Fork

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

diff --git a/wslapi/include/cpl.h b/wslapi/include/cpl.h
--- a/wslapi/include/cpl.h
+++ b/wslapi/include/cpl.h
@@ -1,14 +1,13 @@
 #ifndef _CPL_H
+#pragma GCC system_header
 #define _CPL_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <windef.h>
+
+_BEGIN_C_DECLS
+
 #define WM_CPL_LAUNCH (WM_USER+1000)
 #define WM_CPL_LAUNCHED (WM_USER+1001)
 #define CPL_DYNAMIC_RES 0
 #define CPL_INIT 1
 #define CPL_GETCOUNT 2
@@ -53,9 +52,9 @@ typedef struct tagNEWCPLINFOW {
 typedef NEWCPLINFOW NEWCPLINFO,*LPNEWCPLINFO;
 #else
 #define CPL_STARTWPARMS CPL_STARTWPARMSA
 typedef NEWCPLINFOA NEWCPLINFO,*LPNEWCPLINFO;
 #endif
-#ifdef __cplusplus
-}
+
+_END_C_DECLS
+
 #endif
-#endif