Re: [Mingw-w64-public] [PATCH 02/13] headers: add some guards for library defined in IDL files

[Jacek Caban]

Hi Steve,


Please rebase the series. Patch 2 and 3 should be fixed in git since 
yesterday.



Jacek



___
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

[Mingw-w64-public] [PATCH 02/13] headers: add some guards for library defined in IDL files

[Steve Lhomme]

---
 mingw-w64-headers/include/activdbg.h| 5 -
 mingw-w64-headers/include/adhoc.h   | 5 -
 mingw-w64-headers/include/alg.h | 5 -
 mingw-w64-headers/include/comadmin.h| 5 -
 mingw-w64-headers/include/commoncontrols.h  | 5 -
 mingw-w64-headers/include/control.h | 5 -
 mingw-w64-headers/include/dimm.h| 5 -
 mingw-w64-headers/include/documenttarget.h  | 5 -
 mingw-w64-headers/include/mshtml.h  | 5 -
 mingw-w64-headers/include/msopc.h   | 5 -
 mingw-w64-headers/include/portabledevicetypes.h | 5 -
 mingw-w64-headers/include/propsys.h | 5 -
 mingw-w64-headers/include/sapi51.h  | 5 -
 mingw-w64-headers/include/sapi53.h  | 5 -
 mingw-w64-headers/include/sapi54.h  | 5 -
 mingw-w64-headers/include/sensorsapi.h  | 5 -
 mingw-w64-headers/include/shldisp.h | 5 -
 mingw-w64-headers/include/shobjidl.h| 5 -
 mingw-w64-headers/include/tuner.h   | 5 -
 mingw-w64-headers/include/uianimation.h | 5 -
 mingw-w64-headers/include/wbemads.h | 5 -
 mingw-w64-headers/include/wbemcli.h | 5 -
 mingw-w64-headers/include/wbemdisp.h| 5 -
 mingw-w64-headers/include/wbemprov.h| 5 -
 mingw-w64-headers/include/wbemtran.h| 5 -
 mingw-w64-headers/include/wdstptmgmt.h  | 5 -
 mingw-w64-headers/include/wsmandisp.h   | 5 -
 mingw-w64-headers/include/xpsdigitalsignature.h | 5 -
 mingw-w64-headers/include/xpsobjectmodel.h  | 5 -
 29 files changed, 116 insertions(+), 29 deletions(-)

diff --git a/mingw-w64-headers/include/activdbg.h 
b/mingw-w64-headers/include/activdbg.h
index 24fdda1b..fe1371a9 100644
--- a/mingw-w64-headers/include/activdbg.h
+++ b/mingw-w64-headers/include/activdbg.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/activdbg.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/activdbg.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -9223,6 +9223,8 @@ static FORCEINLINE HRESULT 
IProvideExpressionContexts_EnumExpressionContexts(IPr
 
 #endif  /* __IProvideExpressionContexts_INTERFACE_DEFINED__ */
 
+#ifndef __ProcessDebugManagerLib_LIBRARY_DEFINED__
+#define __ProcessDebugManagerLib_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_ProcessDebugManagerLib, 0x78a51821, 0x51f4, 0x11d0, 
0x8f,0x20, 0x00,0x80,0x5f,0x2c,0xd0,0x64);
 
@@ -9776,6 +9778,7 @@ __CRT_UUID_DECL(DefaultDebugSessionProvider, 0x834128a2, 
0x51f4, 0x11d0, 0x8f,0x
 #endif
 #endif
 
+#endif /* __ProcessDebugManagerLib_LIBRARY_DEFINED__ */
 #endif
 #endif
 /* Begin additional prototypes for all interfaces */
diff --git a/mingw-w64-headers/include/adhoc.h 
b/mingw-w64-headers/include/adhoc.h
index d4cd448b..4a588d33 100644
--- a/mingw-w64-headers/include/adhoc.h
+++ b/mingw-w64-headers/include/adhoc.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/adhoc.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/adhoc.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -1438,6 +1438,8 @@ static FORCEINLINE HRESULT 
IDot11AdHocInterfaceNotificationSink_OnConnectionStat
 
 #endif  /* __IDot11AdHocInterfaceNotificationSink_INTERFACE_DEFINED__ */
 
+#ifndef __ADHOCLib_LIBRARY_DEFINED__
+#define __ADHOCLib_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_ADHOCLib, 0x45357166, 0xff38, 0x4302, 0x8f,0x5c, 
0xdf,0x5b,0x70,0x3a,0x6e,0x3d);
 
@@ -1454,6 +1456,7 @@ __CRT_UUID_DECL(Dot11AdHocManager, 0xdd06a84f, 0x83bd, 
0x4d01, 0x8a,0xb9, 0x23,0
 #endif
 #endif
 
+#endif /* __ADHOCLib_LIBRARY_DEFINED__ */
 #endif
 /* Begin additional prototypes for all interfaces */
 
diff --git a/mingw-w64-headers/include/alg.h b/mingw-w64-headers/include/alg.h
index fb96c4d2..4095d28b 100644
--- a/mingw-w64-headers/include/alg.h
+++ b/mingw-w64-headers/include/alg.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 4.12.1 from include/alg.idl - Do not edit ***/
+/*** Autogenerated by WIDL 6.0-rc1 from include/alg.idl - Do not edit ***/
 
 #ifdef _WIN32
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
@@ -1477,6 +1477,8 @@ static FORCEINLINE HRESULT 
IApplicationGateway_Stop(IApplicationGateway* This) {
 
 #endif  /* __IApplicationGateway_INTERFACE_DEFINED__ */
 
+#ifndef __ALGLib_LIBRARY_DEFINED__
+#define __ALGLib_LIBRARY_DEFINED__
 
 DEFINE_GUID(LIBID_ALGLib, 0xb6d1d098, 0xe235, 0x4b99, 0xba,0x98, 
0x7c,0x62,0x4f,0xd8,0x75,0xdb);
 
@@ -1584,6 +1586,7 @@ __CRT_UUID_DECL(PersistentDataChannel, 0xbc9b54ab, 
0x7883, 0x4c13, 0x90,0x9f, 0x
 #endif
 #endif
 
+#endif /* __ALGLib_LIBRARY_DEFINED__ */
 #endif
 /* Begin additional prototypes for all interfaces */
 
diff --git a/mingw-w64-headers/include/comadmin.h 
b/mingw-w64-headers/include/comadmin.h
index 4f5be2e0..3d1d574a 100644
---