Module: wine Branch: stable Commit: 9c54f0c54a39bfeeabfd19d54fa181dda94bc274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c54f0c54a39bfeeabfd19d54f...
Author: Józef Kucia jkucia@codeweavers.com Date: Wed May 10 16:25:52 2017 +0200
mscoree: Fix compilation on systems that don't support nameless unions.
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Vincent Povirk vincent@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit c1d4d82e15a5f28ef7f9457c7a4b9fcd528b091e) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
dlls/mscoree/assembly.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dlls/mscoree/assembly.c b/dlls/mscoree/assembly.c index 4af6f28..b653556 100644 --- a/dlls/mscoree/assembly.c +++ b/dlls/mscoree/assembly.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#define NONAMELESSUNION + #include <stdarg.h> #include <stdio.h>
@@ -319,7 +321,7 @@ HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc { if (assembly->corhdr->Flags & COMIMAGE_FLAGS_NATIVE_ENTRYPOINT) { - *func = assembly_rva_to_va(assembly, assembly->corhdr->EntryPointRVA); + *func = assembly_rva_to_va(assembly, assembly->corhdr->u.EntryPointRVA); return S_OK; } else