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

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

include: Handle same typelib name in msxml2.idl and msxml6.idl.
2444fea9 · Nikolay Sivov · Alexandre Julliard · 56486a4b · 2444fea9 · 2444fea9
Commit 2444fea9 authored Sep 14, 2020 by Nikolay Sivov Committed by Alexandre Julliard Sep 14, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

msxml2.idl include/msxml2.idl +4 -0

msxml6.idl include/msxml6.idl +4 -0

No files found.
--- 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),

--- 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