mirror of
https://github.com/reactos/reactos.git
synced 2025-01-11 16:51:06 +00:00
Merge from amd64-branch:
44467, 44468, 44470, 44471, 46524 [OLDNAMES] Update moldname-msvcrt.def Add a proper oldnames lib, instead of implicitly including it with mingw. 46526 [FTP/DHCP] - remove the oldnames hack, as we now have a proper oldnames lib (included in mingw_common) - protect struct timezone from redefinition svn path=/trunk/; revision=46592
This commit is contained in:
Timo Kreuzer
parent
a5bffa5902
commit
8627f5ae27
6 changed files with 138 additions and 137 deletions
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0"?>
|
||||
<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
|
||||
<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
|
||||
<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude" allowwarnings="true">
|
||||
<xi:include href="config-amd64.rbuild">
|
||||
<xi:fallback>
|
||||
<xi:include href="config-amd64.template.rbuild" />
|
||||
|
|
@ -28,12 +28,14 @@
|
|||
<compilerflag>-ftracer</compilerflag>
|
||||
<compilerflag>-momit-leaf-frame-pointer</compilerflag>
|
||||
</if>
|
||||
<compilerflag>-fms-extensions</compilerflag>
|
||||
<compilerflag>-mpreferred-stack-boundary=4</compilerflag>
|
||||
<compilerflag compiler="midl">-m64 --win64</compilerflag>
|
||||
<!-- compilerflag compiler="cc,cxx">-gstabs+</compilerflag -->
|
||||
<!-- compilerflag compiler="as">-gstabs+</compilerflag -->
|
||||
<compilerflag>-U_X86_</compilerflag>
|
||||
<compilerflag>-Wno-format</compilerflag>
|
||||
<compilerflag>-fno-leading-underscore</compilerflag>
|
||||
</group>
|
||||
|
||||
<group linkerset="ld">
|
||||
|
|
|
|||
|
|
@ -9,9 +9,12 @@
|
|||
#define strcasecmp _stricmp
|
||||
#define strncasecmp _strnicmp
|
||||
|
||||
#ifndef _TIMEZONE_DEFINED /* also in sys/time.h */
|
||||
#define _TIMEZONE_DEFINED
|
||||
struct timezone {
|
||||
int tz_minuteswest; /* minutes W of Greenwich */
|
||||
int tz_dsttime; /* type of dst correction */
|
||||
int tz_minuteswest;
|
||||
int tz_dsttime;
|
||||
};
|
||||
|
||||
int gettimeofday(struct timeval *tv, struct timezone *tz);
|
||||
extern int __cdecl gettimeofday (struct timeval *p, struct timezone *z);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -4,19 +4,9 @@
|
|||
<include base="ftp">.</include>
|
||||
<define name="lint" />
|
||||
|
||||
<!-- FIXME: workarounds until we have a proper oldnames library -->
|
||||
<define name="chdir">_chdir</define>
|
||||
<define name="getcwd">_getcwd</define>
|
||||
<define name="mktemp">_mktemp</define>
|
||||
<define name="unlink">_unlink</define>
|
||||
<define name="close">_close</define>
|
||||
<define name="fileno">_fileno</define>
|
||||
<define name="read">_read</define>
|
||||
<define name="write">_write</define>
|
||||
<define name="lseek">_lseek</define>
|
||||
|
||||
<library>ws2_32</library>
|
||||
<library>iphlpapi</library>
|
||||
<library>oldnames</library>
|
||||
<file>cmds.c</file>
|
||||
<file>cmdtab.c</file>
|
||||
<file>domacro.c</file>
|
||||
|
|
|
|||
|
|
@ -4,16 +4,11 @@
|
|||
<include base="dhcp">.</include>
|
||||
<include base="dhcp">include</include>
|
||||
|
||||
<!-- FIXME: workarounds until we have a proper oldnames library -->
|
||||
<define name="tzset">_tzset</define>
|
||||
<define name="close">_close</define>
|
||||
<define name="read">_read</define>
|
||||
<define name="write">_write</define>
|
||||
|
||||
<library>ntdll</library>
|
||||
<library>ws2_32</library>
|
||||
<library>iphlpapi</library>
|
||||
<library>advapi32</library>
|
||||
<library>oldnames</library>
|
||||
<file>adapter.c</file>
|
||||
<file>alloc.c</file>
|
||||
<file>api.c</file>
|
||||
|
|
|
|||
10
reactos/lib/3rdparty/mingw/mingw.rbuild
vendored
10
reactos/lib/3rdparty/mingw/mingw.rbuild
vendored
|
|
@ -3,8 +3,12 @@
|
|||
<group>
|
||||
<module name="mingw_common" type="staticlibrary" isstartuplib="true" crt="dll">
|
||||
<define name="_CRTBLD" />
|
||||
|
||||
<!-- This is to prevent from using data imports directly -->
|
||||
<define name="_M_CEE_PURE" />
|
||||
|
||||
<include base="ReactOS">include/reactos/mingw-w64</include>
|
||||
<library>kernel32</library>
|
||||
<library>kernel32</library>
|
||||
<file>_newmode.c</file>
|
||||
<file>atonexit.c</file>
|
||||
<file>charmax.c</file>
|
||||
|
|
@ -50,4 +54,8 @@
|
|||
<file>crtdll.c</file>
|
||||
<file>dllargv.c</file>
|
||||
</module>
|
||||
<module name="oldnames" type="staticlibrary">
|
||||
<define name="_CRTBLD" />
|
||||
<importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" />
|
||||
</module>
|
||||
</group>
|
||||
|
|
|
|||
233
reactos/lib/3rdparty/mingw/moldname-msvcrt.def
vendored
233
reactos/lib/3rdparty/mingw/moldname-msvcrt.def
vendored
|
|
@ -1,118 +1,121 @@
|
|||
LIBRARY msvcrt.dll
|
||||
|
||||
EXPORTS
|
||||
access
|
||||
chdir
|
||||
chmod
|
||||
chsize
|
||||
close
|
||||
creat
|
||||
cwait
|
||||
daylight DATA
|
||||
dup
|
||||
dup2
|
||||
ecvt
|
||||
eof
|
||||
execl
|
||||
execle
|
||||
execlp
|
||||
execlpe
|
||||
execv
|
||||
execve
|
||||
execvp
|
||||
execvpe
|
||||
fcvt
|
||||
fdopen
|
||||
fgetchar
|
||||
fgetwchar
|
||||
filelength
|
||||
fileno
|
||||
; fpreset
|
||||
fputchar
|
||||
fputwchar
|
||||
;fstat
|
||||
ftime
|
||||
gcvt
|
||||
getch
|
||||
getche
|
||||
getcwd
|
||||
getpid
|
||||
getw
|
||||
heapwalk
|
||||
isatty
|
||||
itoa
|
||||
kbhit
|
||||
lfind
|
||||
lsearch
|
||||
lseek
|
||||
ltoa
|
||||
memccpy
|
||||
memicmp
|
||||
mkdir
|
||||
mktemp
|
||||
open
|
||||
pclose
|
||||
popen
|
||||
putch
|
||||
putenv
|
||||
putw
|
||||
read
|
||||
rmdir
|
||||
rmtmp
|
||||
searchenv
|
||||
setmode
|
||||
sopen
|
||||
spawnl
|
||||
spawnle
|
||||
spawnlp
|
||||
spawnlpe
|
||||
spawnv
|
||||
spawnve
|
||||
spawnvp
|
||||
spawnvpe
|
||||
;stat
|
||||
strcmpi
|
||||
strdup
|
||||
stricmp
|
||||
stricoll
|
||||
strlwr
|
||||
strnicmp
|
||||
strnset
|
||||
strrev
|
||||
strset
|
||||
strupr
|
||||
swab
|
||||
tell
|
||||
tempnam
|
||||
timezone DATA
|
||||
tzname DATA
|
||||
tzset
|
||||
umask
|
||||
ungetch
|
||||
unlink
|
||||
utime
|
||||
wcsdup
|
||||
wcsicmp
|
||||
wcsicoll
|
||||
wcslwr
|
||||
wcsnicmp
|
||||
wcsnset
|
||||
wcsrev
|
||||
wcsset
|
||||
wcsupr
|
||||
wpopen
|
||||
write
|
||||
access==_access
|
||||
chdir==_chdir
|
||||
chmod==_chmod
|
||||
chsize==_chsize
|
||||
close==_close
|
||||
creat==_creat
|
||||
cwait==_cwait
|
||||
daylight==_daylight
|
||||
dup==_dup
|
||||
dup2==_dup2
|
||||
ecvt==_ecvt
|
||||
eof==_eof
|
||||
execl==_execl
|
||||
execle==_execle
|
||||
execlp==_execlp
|
||||
execlpe==_execlpe
|
||||
execv==_execv
|
||||
execve==_execve
|
||||
execvp==_execvp
|
||||
execvpe==_execvpe
|
||||
fcvt==_fcvt
|
||||
fdopen==_fdopen
|
||||
fgetchar==_fgetchar
|
||||
fgetwchar==_fgetwchar
|
||||
filelength==_filelength
|
||||
fileno==_fileno
|
||||
fpreset==_fpreset
|
||||
fputchar==_fputchar
|
||||
fputwchar==_fputwchar
|
||||
fstat==_fstat
|
||||
ftime==_ftime
|
||||
gcvt==_gcvt
|
||||
getch==_getch
|
||||
getche==_getche
|
||||
getcwd==_getcwd
|
||||
getpid==_getpid
|
||||
getw==_getw
|
||||
heapwalk==_heapwalk
|
||||
isatty==_isatty
|
||||
itoa==_itoa
|
||||
kbhit==_kbhit
|
||||
lfind==_lfind
|
||||
lsearch==_lsearch
|
||||
lseek==_lseek
|
||||
ltoa==_ltoa
|
||||
memccpy==_memccpy
|
||||
memicmp==_memicmp
|
||||
mkdir==_mkdir
|
||||
mktemp==_mktemp
|
||||
open==_open
|
||||
pclose==_pclose
|
||||
popen==_popen
|
||||
putch==_putch
|
||||
putenv==_putenv
|
||||
putw==_putw
|
||||
read==_read
|
||||
rmdir==_rmdir
|
||||
rmtmp==_rmtmp
|
||||
searchenv==_searchenv
|
||||
setmode==_setmode
|
||||
snprintf=_snprintf
|
||||
sopen==_sopen
|
||||
spawnl==_spawnl
|
||||
spawnle==_spawnle
|
||||
spawnlp==_spawnlp
|
||||
spawnlpe==_spawnlpe
|
||||
spawnv==_spawnv
|
||||
spawnve==_spawnve
|
||||
spawnvp==_spawnvp
|
||||
spawnvpe==_spawnvpe
|
||||
stat==_stat
|
||||
strcmpi==_strcmpi
|
||||
strdup==_strdup
|
||||
stricmp==_stricmp
|
||||
stricoll==_stricoll
|
||||
strlwr==_strlwr
|
||||
strnicmp==_strnicmp
|
||||
strnset==_strnset
|
||||
strrev==_strrev
|
||||
strset==_strset
|
||||
strupr==_strupr
|
||||
swab==_swab
|
||||
tell==_tell
|
||||
tempnam==_tempnam
|
||||
timezone==_timezone
|
||||
tzname==_tzname
|
||||
tzset==_tzset
|
||||
umask==_umask
|
||||
ungetch==_ungetch
|
||||
unlink==_unlink
|
||||
utime==_utime
|
||||
wcsdup==_wcsdup
|
||||
wcsicmp==_wcsicmp
|
||||
wcsicoll==_wcsicoll
|
||||
wcslwr==_wcslwr
|
||||
wcsnicmp==_wcsnicmp
|
||||
wcsnset==_wcsnset
|
||||
wcsrev==_wcsrev
|
||||
wcsset==_wcsset
|
||||
wcsupr==_wcsupr
|
||||
wpopen==_wpopen
|
||||
write==_write
|
||||
; non-ANSI functions declared in math.h
|
||||
j0
|
||||
j1
|
||||
jn
|
||||
y0
|
||||
y1
|
||||
yn
|
||||
chgsign
|
||||
;scalb
|
||||
finite
|
||||
fpclass
|
||||
j0==_j0
|
||||
j1==_j1
|
||||
jn==_jn
|
||||
y0==_y0
|
||||
y1==_y1
|
||||
yn==_yn
|
||||
chgsign==_chgsign
|
||||
scalb==_scalb
|
||||
finite==_finite
|
||||
fpclass==_fpclass
|
||||
; C99 functions
|
||||
cabs
|
||||
hypot
|
||||
logb
|
||||
nextafter
|
||||
cabs==_cabs
|
||||
hypot==_hypot
|
||||
logb==_logb
|
||||
nextafter==_nextafter
|
||||
|
|
|
|||
Loading…
Reference in a new issue