From: Owen Rudge <orudge@codeweavers.com>
Subject: [3/3] include: Remove typedefs from wsdapi.h, reorder includes
Message-Id: <ebfc2f4e-458b-1260-6523-38a31051c4d4@codeweavers.com>
Date: Tue, 18 Apr 2017 20:40:47 +0100


Fixes bug 42835

Signed-off-by: Owen Rudge <orudge@codeweavers.com>
---
  include/wsdapi.h | 25 ++-----------------------
  1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/include/wsdapi.h b/include/wsdapi.h
index 8deb377..dec0954 100644
--- a/include/wsdapi.h
+++ b/include/wsdapi.h
@@ -19,31 +19,10 @@
 #ifndef WSDAPI_H
 #define WSDAPI_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct IWSDMessageParameters IWSDMessageParameters;
-
-typedef struct _WSD_URI_LIST WSD_URI_LIST;
-typedef struct _WSD_NAME_LIST WSD_NAME_LIST;
-
-typedef struct _WSDXML_NAME WSDXML_NAME;
-typedef struct _WSDXML_ELEMENT WSDXML_ELEMENT;
-typedef struct _WSDXML_NODE WSDXML_NODE;
-typedef struct _WSDXML_ATTRIBUTE WSDXML_ATTRIBUTE;
-typedef struct _WSDXML_PREFIX_MAPPING WSDXML_PREFIX_MAPPING;
-typedef struct _WSDXML_ELEMENT_LIST WSDXML_ELEMENT_LIST;
-typedef struct _WSDXML_TYPE WSDXML_TYPE;
-
-#ifdef __cplusplus
-}
-#endif
-
-#include <wsdtypes.h>
 #include <wsdbase.h>
-#include <wsdxmldom.h>
 #include <wsdxml.h>
+#include <wsdxmldom.h>
+#include <wsdtypes.h>
 #include <wsddisco.h>
 
 #endif