Author: tkreuzer
Date: Tue Feb 15 17:36:10 2011
New Revision: 50715
URL: http://svn.reactos.org/svn/reactos?rev=50715&view=rev
Log:
[WINE]
Don't define __ASM_DEFINE_FUNC and __ASM_STDCALL_FUNC on MSVC builds
Modified:
branches/cmake-bringup/include/reactos/wine/config.h
Modified: branches/cmake-bringup/include/reactos/wine/config.h
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/wine/config.h?rev=50715&r1=50714&r2=50715&view=diff
==============================================================================
--- branches/cmake-bringup/include/reactos/wine/config.h [iso-8859-1] (original)
+++ branches/cmake-bringup/include/reactos/wine/config.h [iso-8859-1] Tue Feb
15 17:36:10 2011
@@ -1020,10 +1020,12 @@
#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 */
@@ -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 */
