include: Avoid some type redefinitions.

This commit is contained in:
Alexandre Julliard 2015-09-14 16:19:14 +09:00
parent a7e294c064
commit b30517defd
1 changed files with 9 additions and 8 deletions

View File

@ -25,10 +25,11 @@ extern "C" {
typedef struct _WS_ERROR WS_ERROR; typedef struct _WS_ERROR WS_ERROR;
typedef struct _WS_HEAP WS_HEAP; typedef struct _WS_HEAP WS_HEAP;
typedef struct _WS_STRUCT_DESCRIPTION WS_STRUCT_DESCRIPTION;
typedef struct _WS_XML_BUFFER WS_XML_BUFFER; typedef struct _WS_XML_BUFFER WS_XML_BUFFER;
typedef struct _WS_XML_READER WS_XML_READER; typedef struct _WS_XML_READER WS_XML_READER;
typedef struct _WS_XML_STRING WS_XML_STRING;
struct _WS_STRUCT_DESCRIPTION;
struct _WS_XML_STRING;
typedef enum { typedef enum {
WS_ERROR_PROPERTY_STRING_COUNT, WS_ERROR_PROPERTY_STRING_COUNT,
@ -141,7 +142,7 @@ typedef struct _WS_XML_READER_STREAM_INPUT {
typedef struct _WS_XML_DICTIONARY { typedef struct _WS_XML_DICTIONARY {
GUID guid; GUID guid;
WS_XML_STRING *strings; struct _WS_XML_STRING *strings;
ULONG stringCount; ULONG stringCount;
BOOL isConst; BOOL isConst;
} WS_XML_DICTIONARY; } WS_XML_DICTIONARY;
@ -254,8 +255,8 @@ typedef struct _WS_STRUCT_DESCRIPTION {
ULONG fieldCount; ULONG fieldCount;
WS_XML_STRING *typeLocalName; WS_XML_STRING *typeLocalName;
WS_XML_STRING *typeNs; WS_XML_STRING *typeNs;
WS_STRUCT_DESCRIPTION *parentType; struct _WS_STRUCT_DESCRIPTION *parentType;
WS_STRUCT_DESCRIPTION **subTypes; struct _WS_STRUCT_DESCRIPTION **subTypes;
ULONG subTypeCount; ULONG subTypeCount;
ULONG structOptions; ULONG structOptions;
} WS_STRUCT_DESCRIPTION; } WS_STRUCT_DESCRIPTION;