mingw-wsl-patches

Fork

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

diff --git a/wslapi/include/oleidl.h b/wslapi/include/oleidl.h
--- a/wslapi/include/oleidl.h
+++ b/wslapi/include/oleidl.h
@@ -1,16 +1,16 @@
 #ifndef _OLEIDL_H
+#pragma GCC system_header
+
+#ifndef _UNKNWN_H
+#include <unknwn.h>
+
+#else
 #define _OLEIDL_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
+#include <objfwd.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <objfwd.h>
+_BEGIN_C_DECLS
 
 #define MK_ALT	32
 
 typedef _COM_interface IParseDisplayName *LPPARSEDISPLAYNAME;
 typedef _COM_interface IOleContainer *LPOLECONTAINER;
@@ -566,10 +566,9 @@ DECLARE_INTERFACE_(IOleCacheControl,IUnk
 	STDMETHOD(OnRun)(THIS_ LPDATAOBJECT) PURE;
 	STDMETHOD(OnStop)(THIS) PURE;
 };
 #undef INTERFACE
 
-#ifdef __cplusplus
-}
+_END_C_DECLS
+
 #endif
 #endif
-