problem compiling dlls/ntdll/actctx.c

[Ben Taylor]

haven't built wine in a while, and ran into this on Solaris 10:

actctx.c:76: error: `version' defined as wrong kind of tag
gmake[2]: *** [actctx.o] Error 1
gmake[2]: Leaving directory `/export/src/wine/100607/wine/dlls/ntdll'
gmake[1]: *** [ntdll] Error 2
gmake[1]: Leaving directory `/export/src/wine/100607/wine/dlls'
gmake: *** [dlls] Error 2

starting line 74 of actctx.c, I see

struct version
{
    USHORT              major;
    USHORT              minor;
    USHORT              build;
    USHORT              revision;
};

struct assembly_identity
{
    WCHAR                *name;
    WCHAR                *arch;
    WCHAR                *public_key;
    WCHAR                *language;
    WCHAR                *type;
    struct version        version;
    BOOL                  optional;
};


struct entity
{
    DWORD kind;
    union
    {
        struct
        {
            WCHAR *tlbid;
            WCHAR *version;
            WCHAR *helpdir;
        } typelib;
        struct
        {
            WCHAR *clsid;
        } comclass;
        struct {
            WCHAR *iid;
            WCHAR *name;
        } proxy;
        struct
        {
            WCHAR *name;
        } class;
        struct
        {
            WCHAR *name;
            WCHAR *clsid;
        } clrclass;
        struct
        {
            WCHAR *name;
            WCHAR *clsid;
        } clrsurrogate;
    } u;
};


But after some google searches and such, I can't come to a conclusion if it's
a clash with a predefined version in a Solaris include file, or a clash with the
version in the union which is a WCHAR.

Ideas.?