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>
This commit is contained in:
parent
56486a4bfc
commit
2444fea99b
|
@ -31,6 +31,10 @@ import "oaidl.idl";
|
||||||
#define vi_progid(str)
|
#define vi_progid(str)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
cpp_quote("#ifdef __ISAXXMLReader_INTERFACE_DEFINED__")
|
||||||
|
cpp_quote("#undef __MSXML2_LIBRARY_DEFINED__")
|
||||||
|
cpp_quote("#endif")
|
||||||
|
|
||||||
[
|
[
|
||||||
uuid(f5078f18-c551-11d3-89b9-0000f81fe221),
|
uuid(f5078f18-c551-11d3-89b9-0000f81fe221),
|
||||||
version(3.0),
|
version(3.0),
|
||||||
|
|
|
@ -99,6 +99,10 @@ interface ISchemaAny;
|
||||||
interface ISchemaIdentityConstraint;
|
interface ISchemaIdentityConstraint;
|
||||||
interface ISchemaNotation;
|
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("#ifndef __MSXML_DOMNODETYPE_DEFINED")
|
||||||
cpp_quote("#define __MSXML_DOMNODETYPE_DEFINED")
|
cpp_quote("#define __MSXML_DOMNODETYPE_DEFINED")
|
||||||
typedef enum tagDOMNodeType
|
typedef enum tagDOMNodeType
|
||||||
|
|
Loading…
Reference in New Issue