mirror of
https://github.com/reactos/reactos.git
synced 2024-10-23 14:36:11 +00:00
[MSVCRTEX]
- Fix some warnings - Remove a ros-diff in favor of mingw-w64's solution svn path=/trunk/; revision=54313
This commit is contained in:
parent
bf96abff4b
commit
4cabf96ae6
|
@ -63,6 +63,8 @@ endif()
|
||||||
add_library(msvcrtex ${MSVCRTEX_SOURCE})
|
add_library(msvcrtex ${MSVCRTEX_SOURCE})
|
||||||
add_target_compile_definitions(msvcrtex _DLL)
|
add_target_compile_definitions(msvcrtex _DLL)
|
||||||
set_source_files_properties(startup/crtdll.c PROPERTIES COMPILE_DEFINITIONS CRTDLL)
|
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)
|
if(NOT MSVC)
|
||||||
target_link_libraries(msvcrtex oldnames)
|
target_link_libraries(msvcrtex oldnames)
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <memory.h>
|
#include <memory.h>
|
||||||
|
#include <malloc.h>
|
||||||
|
|
||||||
#if defined(__CYGWIN__)
|
#if defined(__CYGWIN__)
|
||||||
#include <wchar.h>
|
#include <wchar.h>
|
||||||
|
@ -46,10 +47,7 @@
|
||||||
|
|
||||||
extern char __RUNTIME_PSEUDO_RELOC_LIST__;
|
extern char __RUNTIME_PSEUDO_RELOC_LIST__;
|
||||||
extern char __RUNTIME_PSEUDO_RELOC_LIST_END__;
|
extern char __RUNTIME_PSEUDO_RELOC_LIST_END__;
|
||||||
#ifndef _MSC_VER
|
extern char __MINGW_LSYMBOL(_image_base__);
|
||||||
#define __ImageBase __MINGW_LSYMBOL(_image_base__)
|
|
||||||
#endif
|
|
||||||
extern char __ImageBase;
|
|
||||||
|
|
||||||
void _pei386_runtime_relocator (void);
|
void _pei386_runtime_relocator (void);
|
||||||
|
|
||||||
|
@ -466,7 +464,12 @@ _pei386_runtime_relocator (void)
|
||||||
|
|
||||||
do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__,
|
do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__,
|
||||||
&__RUNTIME_PSEUDO_RELOC_LIST_END__,
|
&__RUNTIME_PSEUDO_RELOC_LIST_END__,
|
||||||
&__MINGW_LSYMBOL(_image_base__));
|
#ifdef __GNUC__
|
||||||
|
&__MINGW_LSYMBOL(_image_base__)
|
||||||
|
#else
|
||||||
|
&__ImageBase
|
||||||
|
#endif
|
||||||
|
);
|
||||||
#ifdef __MINGW64_VERSION_MAJOR
|
#ifdef __MINGW64_VERSION_MAJOR
|
||||||
restore_modified_sections ();
|
restore_modified_sections ();
|
||||||
#endif /* __MINGW64_VERSION_MAJOR */
|
#endif /* __MINGW64_VERSION_MAJOR */
|
||||||
|
|
Loading…
Reference in a new issue