[llvm-commits] [llvm-gcc-4.2] r54670 - /llvm-gcc-4.2/trunk/gcc/libgcc2.c

[Bill Wendling]

Author: void
Date: Tue Aug 12 02:37:27 2008
New Revision: 54670

URL: http://llvm.org/viewvc/llvm-project?rev=54670&view=rev
Log:
Fix compilation of MingW by checking that winbase has not
already been included. Patch by Julien Lerouge!

Modified:
    llvm-gcc-4.2/trunk/gcc/libgcc2.c

Modified: llvm-gcc-4.2/trunk/gcc/libgcc2.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/libgcc2.c?rev=54670&r1=54669&r2=54670&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/libgcc2.c (original)
+++ llvm-gcc-4.2/trunk/gcc/libgcc2.c Tue Aug 12 02:37:27 2008
@@ -2091,7 +2091,7 @@
 #endif
 }
 
-#ifdef __i386__
+#if defined(__i386__) && ! defined(_WINBASE_H)
 extern int VirtualProtect (char *, int, int, int *) __attribute__((stdcall));
 #endif