[ros-diffs] [akhaldi] 52267: [CMAKE] * Merge 50715 from the cmake branch.

Author: akhaldi
Date: Wed Jun 15 23:07:31 2011
New Revision: 52267
URL: http://svn.reactos.org/svn/reactos?rev=52267&view=rev
Log:
[CMAKE]
* Merge 50715 from the cmake branch.
Modified:
    trunk/reactos/include/reactos/wine/config.h
Modified: trunk/reactos/include/reactos/wine/config.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi…
==============================================================================
--- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Wed Jun 15 23:07:31 2011
@@ -1014,10 +1014,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 */