From 94da3603aff6656adbc82e12d20ac910a4a95af0 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Tue, 15 Feb 2011 17:36:10 +0000 Subject: [PATCH] [WINE] Don't define __ASM_DEFINE_FUNC and __ASM_STDCALL_FUNC on MSVC builds svn path=/branches/cmake-bringup/; revision=50715 --- include/reactos/wine/config.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/reactos/wine/config.h b/include/reactos/wine/config.h index cc682661373..2d62068fd05 100644 --- a/include/reactos/wine/config.h +++ b/include/reactos/wine/config.h @@ -1020,11 +1020,13 @@ #define __ASM_CFI(str) str /* Define to a macro to define an assembly function */ +#ifndef _MSC_VER #ifndef NO_UNDERSCORE_PREFIX #define __ASM_DEFINE_FUNC(name,suffix,code) asm(".text\n\t.align 4\n\t.globl _" #name suffix "\n\t.def _" #name suffix "; .scl 2; .type 32; .endef\n_" #name suffix ":\n\t.cfi_startproc\n\t" code "\n\t.cfi_endproc"); #else #define __ASM_DEFINE_FUNC(name,suffix,code) asm(".text\n\t.align 4\n\t.globl " #name suffix "\n\t.def " #name suffix "; .scl 2; .type 32; .endef\n" #name suffix ":\n\t.cfi_startproc\n\t" code "\n\t.cfi_endproc"); #endif +#endif /* Define to a macro to generate an assembly function directive */ #define __ASM_FUNC(name) ".def " __ASM_NAME(name) "; .scl 2; .type 32; .endef" @@ -1045,7 +1047,9 @@ /* Define to a macro to generate an assembly function with stdcall calling convention */ +#ifndef _MSC_VER #define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(name,__ASM_STDCALL(args),code) +#endif /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */