Module: wine Branch: master Commit: b7279badfa1583d9bb82bd951b0b621846cc38ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7279badfa1583d9bb82bd951b...
Author: Owen Rudge orudge@codeweavers.com Date: Wed Apr 19 20:47:22 2017 +0100
include: Avoid redefining WSDXML typedefs.
Signed-off-by: Owen Rudge orudge@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
include/wsdxml.idl | 9 +-------- include/wsdxmldom.h | 3 +++ 2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/include/wsdxml.idl b/include/wsdxml.idl index 0a63ffb..e86d54b 100644 --- a/include/wsdxml.idl +++ b/include/wsdxml.idl @@ -18,14 +18,7 @@
import "oaidl.idl"; import "ocidl.idl"; - -typedef struct _WSDXML_NAMESPACE WSDXML_NAMESPACE; -typedef struct _WSDXML_NAME WSDXML_NAME; -typedef struct _WSDXML_TYPE WSDXML_TYPE; -typedef struct _WSDXML_ELEMENT WSDXML_ELEMENT; - -typedef const WSDXML_NAMESPACE *PCWSDXML_NAMESPACE; -typedef const WSDXML_TYPE *PCWSDXML_TYPE; +import "wsdxmldom.h";
interface IWSDXMLContext;
diff --git a/include/wsdxmldom.h b/include/wsdxmldom.h index 59e481c..e9fb3bd 100644 --- a/include/wsdxmldom.h +++ b/include/wsdxmldom.h @@ -27,6 +27,9 @@ typedef struct _WSDXML_ATTRIBUTE WSDXML_ATTRIBUTE; typedef struct _WSDXML_NODE WSDXML_NODE; typedef struct _WSDXML_ELEMENT WSDXML_ELEMENT;
+typedef const WSDXML_NAMESPACE *PCWSDXML_NAMESPACE; +typedef const WSDXML_TYPE *PCWSDXML_TYPE; + struct _WSDXML_TYPE { const WCHAR *Uri;