-------------- Original message ---------------------- From: Jacek Caban <[EMAIL PROTECTED]> > Hi Ben, > > Ben Taylor wrote: > > 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 > > > > > > Does the attached patch help?
Yes. That works. Ben > > Jacek >
--- Begin Message --->From 35659e558b470e36fef16ec09a4c459ed1500640 Mon Sep 17 00:00:00 2001 From: Jacek Caban <[EMAIL PROTECTED]> Date: Sun, 7 Oct 2007 11:17:04 +0200 Subject: [PATCH] actctx: Rename version to assembly_version. To: wine-patches <[EMAIL PROTECTED]> --- dlls/ntdll/actctx.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 4f0901b..2021cb8 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -72,7 +72,7 @@ struct file_info WCHAR *info; }; -struct version +struct assembly_version { USHORT major; USHORT minor; @@ -87,7 +87,7 @@ struct assembly_identity WCHAR *public_key; WCHAR *language; WCHAR *type; - struct version version; + struct assembly_version version; BOOL optional; }; @@ -272,7 +272,7 @@ static inline const char* debugstr_xmlstr(const xmlstr_t* str) return debugstr_wn(str->ptr, str->len); } -static inline const char* debugstr_version(const struct version *ver) +static inline const char* debugstr_version(const struct assembly_version *ver) { return wine_dbg_sprintf("%u.%u.%u.%u", ver->major, ver->minor, ver->build, ver->revision); } @@ -743,7 +743,7 @@ static BOOL parse_text_content(xmlbuf_t* xmlbuf, xmlstr_t* content) return TRUE; } -static BOOL parse_version(const xmlstr_t *str, struct version *version) +static BOOL parse_version(const xmlstr_t *str, struct assembly_version *version) { unsigned int ver[4]; unsigned int pos; -- 1.5.3.2
--- End Message ---
