[ros-diffs] [tkreuzer] 49505: [MINGW] Don't define __ImageBase to something else on MSVC builds

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Sat Nov 6 00:25:58 UTC 2010


Author: tkreuzer
Date: Sat Nov  6 00:25:57 2010
New Revision: 49505

URL: http://svn.reactos.org/svn/reactos?rev=49505&view=rev
Log:
[MINGW]
Don't define __ImageBase to something else on MSVC builds

Modified:
    branches/cmake-bringup/lib/3rdparty/mingw/crt_handler.c
    branches/cmake-bringup/lib/3rdparty/mingw/crtexe.c
    branches/cmake-bringup/lib/3rdparty/mingw/pesect.c
    branches/cmake-bringup/lib/3rdparty/mingw/pseudo-reloc.c

Modified: branches/cmake-bringup/lib/3rdparty/mingw/crt_handler.c
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/mingw/crt_handler.c?rev=49505&r1=49504&r2=49505&view=diff
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/mingw/crt_handler.c [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/mingw/crt_handler.c [iso-8859-1] Sat Nov  6 00:25:57 2010
@@ -16,7 +16,9 @@
 #if defined (_WIN64) && defined (__ia64__)
 #error FIXME: Unsupported __ImageBase implementation.
 #else
+#ifndef _MSC_VER
 #define __ImageBase __MINGW_LSYMBOL(_image_base__)
+#endif
 /* This symbol is defined by the linker.  */
 extern IMAGE_DOS_HEADER __ImageBase;
 #endif

Modified: branches/cmake-bringup/lib/3rdparty/mingw/crtexe.c
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/mingw/crtexe.c?rev=49505&r1=49504&r2=49505&view=diff
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/mingw/crtexe.c [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/mingw/crtexe.c [iso-8859-1] Sat Nov  6 00:25:57 2010
@@ -33,7 +33,10 @@
 #endif
 
 /* Hack, for bug in ld.  Will be removed soon.  */
+#ifndef _MSC_VER
 #define __ImageBase __MINGW_LSYMBOL(_image_base__)
+#endif
+
 /* This symbol is defined by ld.  */
 extern IMAGE_DOS_HEADER __ImageBase;
 

Modified: branches/cmake-bringup/lib/3rdparty/mingw/pesect.c
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/mingw/pesect.c?rev=49505&r1=49504&r2=49505&view=diff
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/mingw/pesect.c [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/mingw/pesect.c [iso-8859-1] Sat Nov  6 00:25:57 2010
@@ -11,7 +11,9 @@
 #error FIXME: Unsupported __ImageBase implementation.
 #else
 /* Hack, for bug in ld.  Will be removed soon.  */
+#ifndef _MSC_VER
 #define __ImageBase __MINGW_LSYMBOL(_image_base__)
+#endif
 /* This symbol is defined by the linker.  */
 extern IMAGE_DOS_HEADER __ImageBase;
 #endif

Modified: branches/cmake-bringup/lib/3rdparty/mingw/pseudo-reloc.c
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/mingw/pseudo-reloc.c?rev=49505&r1=49504&r2=49505&view=diff
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] Sat Nov  6 00:25:57 2010
@@ -46,7 +46,10 @@
 
 extern char __RUNTIME_PSEUDO_RELOC_LIST__;
 extern char __RUNTIME_PSEUDO_RELOC_LIST_END__;
-extern char __MINGW_LSYMBOL(_image_base__);
+#ifndef _MSC_VER
+#define __ImageBase __MINGW_LSYMBOL(_image_base__)
+#endif
+extern char __ImageBase;
 
 void _pei386_runtime_relocator (void);
 
@@ -363,5 +366,5 @@
   ++was_init;
   do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__,
 		   &__RUNTIME_PSEUDO_RELOC_LIST_END__,
-		   &__MINGW_LSYMBOL(_image_base__));
+		   &__ImageBase);
 }




More information about the Ros-diffs mailing list