From: Owen Rudge Subject: include: Avoid redefining WSDXML typedefs Message-Id: <7b3db10c-22bd-18b7-3fff-69352e63efda@codeweavers.com> Date: Wed, 19 Apr 2017 20:47:22 +0100 Follow-up to fix for bug 42835 Signed-off-by: Owen Rudge --- 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;