Nikolay Sivov : include: Handle same typelib name in msxml2.idl and msxml6.idl.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2444fea99bb177c52ed801b846606f30bc3b6c27
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=2444fea99bb177c52ed801b846606f30bc3b6c27

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon Sep 14 15:39:54 2020 +0300

include: Handle same typelib name in msxml2.idl and msxml6.idl.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 include/msxml2.idl | 4 ++++
 include/msxml6.idl | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/include/msxml2.idl b/include/msxml2.idl
index 452338bb01..916e0e8ab3 100644
--- a/include/msxml2.idl
+++ b/include/msxml2.idl
@@ -31,6 +31,10 @@ import "oaidl.idl";
 #define vi_progid(str)
 #endif
 
+cpp_quote("#ifdef __ISAXXMLReader_INTERFACE_DEFINED__")
+cpp_quote("#undef __MSXML2_LIBRARY_DEFINED__")
+cpp_quote("#endif")
+
 [
     uuid(f5078f18-c551-11d3-89b9-0000f81fe221),
     version(3.0),
diff --git a/include/msxml6.idl b/include/msxml6.idl
index 113704d5db..5bfb21d04a 100644
--- a/include/msxml6.idl
+++ b/include/msxml6.idl
@@ -99,6 +99,10 @@ interface ISchemaAny;
 interface ISchemaIdentityConstraint;
 interface ISchemaNotation;
 
+cpp_quote("#ifdef __ISAXXMLReader_INTERFACE_DEFINED__")
+cpp_quote("#undef __MSXML2_LIBRARY_DEFINED__")
+cpp_quote("#endif")
+
 cpp_quote("#ifndef __MSXML_DOMNODETYPE_DEFINED")
 cpp_quote("#define __MSXML_DOMNODETYPE_DEFINED")
 typedef enum tagDOMNodeType