From 3bdcd4c29c500dbc2f88cf14b65c990669e1f602 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 15 Jun 2011 23:07:31 +0000 Subject: [PATCH] [CMAKE] * Merge 50715 from the cmake branch. svn path=/trunk/; revision=52267 --- reactos/include/reactos/wine/config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/reactos/include/reactos/wine/config.h b/reactos/include/reactos/wine/config.h index 5486c449af8..6973c336a46 100644 --- a/reactos/include/reactos/wine/config.h +++ b/reactos/include/reactos/wine/config.h @@ -1014,11 +1014,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"