Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-12 23:55:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MSVCRTEX]

Browse source 
- Fix some warnings
- Remove a ros-diff in favor of mingw-w64's solution

svn path=/trunk/; revision=54313
This commit is contained in:
Thomas Faber 2011-11-06 13:07:43 +00:00
parent bf96abff4b
commit 4cabf96ae6
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/lib/sdk/crt/msvcrtex.cmake
View file

@ -63,6 +63,8 @@ endif()
add_library(msvcrtex ${MSVCRTEX_SOURCE})
add_target_compile_definitions(msvcrtex _DLL)
set_source_files_properties(startup/crtdll.c PROPERTIES COMPILE_DEFINITIONS CRTDLL)
set_source_files_properties(startup/crtexe.c
startup/wcrtexe.c PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE)
if(NOT MSVC)
target_link_libraries(msvcrtex oldnames)

13
reactos/lib/sdk/crt/startup/pseudo-reloc.c
View file

@ -20,6 +20,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include <memory.h>
#include <malloc.h>
#if defined(__CYGWIN__)
#include <wchar.h>
@ -46,10 +47,7 @@
extern char __RUNTIME_PSEUDO_RELOC_LIST__;
extern char __RUNTIME_PSEUDO_RELOC_LIST_END__;
#ifndef _MSC_VER
#define __ImageBase __MINGW_LSYMBOL(_image_base__)
#endif
extern char __ImageBase;
extern char __MINGW_LSYMBOL(_image_base__);
void _pei386_runtime_relocator (void);
@ -466,7 +464,12 @@ _pei386_runtime_relocator (void)
do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__,
&__RUNTIME_PSEUDO_RELOC_LIST_END__,
&__MINGW_LSYMBOL(_image_base__));
#ifdef __GNUC__
&__MINGW_LSYMBOL(_image_base__)
#else
&__ImageBase
#endif
);
#ifdef __MINGW64_VERSION_MAJOR
restore_modified_sections ();
#endif /* __MINGW64_VERSION_MAJOR */