msvcrt: Add some more MSVCRT prefixes to avoid conflicts with recent Mingw.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
e4d34098a6
commit
dd016c031a
|
@ -630,12 +630,12 @@
|
|||
@ cdecl __p___mb_cur_max()
|
||||
@ cdecl __p___wargv() MSVCRT___p___wargv
|
||||
@ cdecl __p___winitenv()
|
||||
@ cdecl __p__acmdln()
|
||||
@ cdecl __p__acmdln() MSVCRT___p__acmdln
|
||||
@ cdecl __p__commode()
|
||||
@ cdecl __p__daylight() MSVCRT___p__daylight
|
||||
@ cdecl __p__dstbias() MSVCRT___p__dstbias
|
||||
@ cdecl __p__environ() MSVCRT___p__environ
|
||||
@ cdecl __p__fmode()
|
||||
@ cdecl __p__fmode() MSVCRT___p__fmode
|
||||
@ cdecl __p__iob() MSVCRT___iob_func
|
||||
@ stub __p__mbcasemap()
|
||||
@ cdecl __p__mbctype()
|
||||
|
@ -644,7 +644,7 @@
|
|||
@ stub __p__pwctype()
|
||||
@ cdecl __p__timezone() MSVCRT___p__timezone
|
||||
@ cdecl __p__tzname()
|
||||
@ cdecl __p__wcmdln()
|
||||
@ cdecl __p__wcmdln() MSVCRT___p__wcmdln
|
||||
@ cdecl __p__wenviron() MSVCRT___p__wenviron
|
||||
@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr
|
||||
@ cdecl __pctype_func() MSVCRT___pctype_func
|
||||
|
|
|
@ -979,12 +979,12 @@
|
|||
@ cdecl __p___mb_cur_max()
|
||||
@ cdecl __p___wargv() MSVCRT___p___wargv
|
||||
@ cdecl __p___winitenv()
|
||||
@ cdecl __p__acmdln()
|
||||
@ cdecl __p__acmdln() MSVCRT___p__acmdln
|
||||
@ cdecl __p__commode()
|
||||
@ cdecl __p__daylight() MSVCRT___p__daylight
|
||||
@ cdecl __p__dstbias() MSVCRT___p__dstbias
|
||||
@ cdecl __p__environ() MSVCRT___p__environ
|
||||
@ cdecl __p__fmode()
|
||||
@ cdecl __p__fmode() MSVCRT___p__fmode
|
||||
@ cdecl __p__iob() MSVCRT___iob_func
|
||||
@ stub __p__mbcasemap()
|
||||
@ cdecl __p__mbctype()
|
||||
|
@ -993,7 +993,7 @@
|
|||
@ stub __p__pwctype()
|
||||
@ cdecl __p__timezone() MSVCRT___p__timezone
|
||||
@ cdecl __p__tzname()
|
||||
@ cdecl __p__wcmdln()
|
||||
@ cdecl __p__wcmdln() MSVCRT___p__wcmdln
|
||||
@ cdecl __p__wenviron() MSVCRT___p__wenviron
|
||||
@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr
|
||||
@ cdecl __pctype_func() MSVCRT___pctype_func
|
||||
|
|
|
@ -969,12 +969,12 @@
|
|||
@ cdecl __p___mb_cur_max()
|
||||
@ cdecl __p___wargv() MSVCRT___p___wargv
|
||||
@ cdecl __p___winitenv()
|
||||
@ cdecl __p__acmdln()
|
||||
@ cdecl __p__acmdln() MSVCRT___p__acmdln
|
||||
@ cdecl __p__commode()
|
||||
@ cdecl __p__daylight() MSVCRT___p__daylight
|
||||
@ cdecl __p__dstbias() MSVCRT___p__dstbias
|
||||
@ cdecl __p__environ() MSVCRT___p__environ
|
||||
@ cdecl __p__fmode()
|
||||
@ cdecl __p__fmode() MSVCRT___p__fmode
|
||||
@ cdecl __p__iob() MSVCRT___iob_func
|
||||
@ stub __p__mbcasemap()
|
||||
@ cdecl __p__mbctype()
|
||||
|
@ -983,7 +983,7 @@
|
|||
@ stub __p__pwctype()
|
||||
@ cdecl __p__timezone() MSVCRT___p__timezone
|
||||
@ cdecl __p__tzname()
|
||||
@ cdecl __p__wcmdln()
|
||||
@ cdecl __p__wcmdln() MSVCRT___p__wcmdln
|
||||
@ cdecl __p__wenviron() MSVCRT___p__wenviron
|
||||
@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr
|
||||
@ cdecl __pctype_func() MSVCRT___pctype_func
|
||||
|
|
|
@ -167,14 +167,14 @@
|
|||
@ cdecl __p___mb_cur_max()
|
||||
@ cdecl __p___wargv() MSVCRT___p___wargv
|
||||
@ cdecl __p___winitenv()
|
||||
@ cdecl __p__acmdln()
|
||||
@ cdecl __p__acmdln() MSVCRT___p__acmdln
|
||||
@ cdecl __p__amblksiz()
|
||||
@ cdecl __p__commode()
|
||||
@ cdecl __p__daylight() MSVCRT___p__daylight
|
||||
@ cdecl __p__dstbias() MSVCRT___p__dstbias
|
||||
@ cdecl __p__environ() MSVCRT___p__environ
|
||||
@ stub __p__fileinfo()
|
||||
@ cdecl __p__fmode()
|
||||
@ cdecl __p__fmode() MSVCRT___p__fmode
|
||||
@ cdecl __p__iob() MSVCRT___iob_func
|
||||
@ stub __p__mbcasemap()
|
||||
@ cdecl __p__mbctype()
|
||||
|
@ -184,7 +184,7 @@
|
|||
@ stub __p__pwctype()
|
||||
@ cdecl __p__timezone() MSVCRT___p__timezone
|
||||
@ cdecl __p__tzname()
|
||||
@ cdecl __p__wcmdln()
|
||||
@ cdecl __p__wcmdln() MSVCRT___p__wcmdln
|
||||
@ cdecl __p__wenviron() MSVCRT___p__wenviron
|
||||
@ cdecl __p__winmajor()
|
||||
@ cdecl __p__winminor()
|
||||
|
|
|
@ -162,14 +162,14 @@
|
|||
@ cdecl __p___mb_cur_max()
|
||||
@ cdecl __p___wargv() MSVCRT___p___wargv
|
||||
@ cdecl __p___winitenv()
|
||||
@ cdecl __p__acmdln()
|
||||
@ cdecl __p__acmdln() MSVCRT___p__acmdln
|
||||
@ cdecl __p__amblksiz()
|
||||
@ cdecl __p__commode()
|
||||
@ cdecl __p__daylight() MSVCRT___p__daylight
|
||||
@ cdecl __p__dstbias() MSVCRT___p__dstbias
|
||||
@ cdecl __p__environ() MSVCRT___p__environ
|
||||
@ stub __p__fileinfo()
|
||||
@ cdecl __p__fmode()
|
||||
@ cdecl __p__fmode() MSVCRT___p__fmode
|
||||
@ cdecl __p__iob() MSVCRT___iob_func
|
||||
@ stub __p__mbcasemap()
|
||||
@ cdecl __p__mbctype()
|
||||
|
@ -179,7 +179,7 @@
|
|||
@ stub __p__pwctype()
|
||||
@ cdecl __p__timezone() MSVCRT___p__timezone
|
||||
@ cdecl __p__tzname()
|
||||
@ cdecl __p__wcmdln()
|
||||
@ cdecl __p__wcmdln() MSVCRT___p__wcmdln
|
||||
@ cdecl __p__wenviron() MSVCRT___p__wenviron
|
||||
@ cdecl __p__winmajor()
|
||||
@ cdecl __p__winminor()
|
||||
|
|
|
@ -273,13 +273,13 @@
|
|||
@ cdecl __p___mb_cur_max()
|
||||
@ cdecl __p___wargv() MSVCRT___p___wargv
|
||||
@ cdecl __p___winitenv()
|
||||
@ cdecl __p__acmdln()
|
||||
@ cdecl __p__acmdln() MSVCRT___p__acmdln
|
||||
@ cdecl __p__amblksiz()
|
||||
@ cdecl __p__commode()
|
||||
@ cdecl __p__daylight() MSVCRT___p__daylight
|
||||
@ cdecl __p__dstbias() MSVCRT___p__dstbias
|
||||
@ cdecl __p__environ() MSVCRT___p__environ
|
||||
@ cdecl __p__fmode()
|
||||
@ cdecl __p__fmode() MSVCRT___p__fmode
|
||||
@ cdecl __p__iob() MSVCRT___iob_func
|
||||
@ stub __p__mbcasemap()
|
||||
@ cdecl __p__mbctype()
|
||||
|
@ -290,7 +290,7 @@
|
|||
@ stub __p__pwctype()
|
||||
@ cdecl __p__timezone() MSVCRT___p__timezone
|
||||
@ cdecl __p__tzname()
|
||||
@ cdecl __p__wcmdln()
|
||||
@ cdecl __p__wcmdln() MSVCRT___p__wcmdln
|
||||
@ cdecl __p__wenviron() MSVCRT___p__wenviron
|
||||
@ cdecl __p__winmajor()
|
||||
@ cdecl __p__winminor()
|
||||
|
|
|
@ -262,13 +262,13 @@
|
|||
@ cdecl __p___mb_cur_max()
|
||||
@ cdecl __p___wargv() MSVCRT___p___wargv
|
||||
@ cdecl __p___winitenv()
|
||||
@ cdecl __p__acmdln()
|
||||
@ cdecl __p__acmdln() MSVCRT___p__acmdln
|
||||
@ cdecl __p__amblksiz()
|
||||
@ cdecl __p__commode()
|
||||
@ cdecl __p__daylight() MSVCRT___p__daylight
|
||||
@ cdecl __p__dstbias() MSVCRT___p__dstbias
|
||||
@ cdecl __p__environ() MSVCRT___p__environ
|
||||
@ cdecl __p__fmode()
|
||||
@ cdecl __p__fmode() MSVCRT___p__fmode
|
||||
@ cdecl __p__iob() MSVCRT___iob_func
|
||||
@ stub __p__mbcasemap()
|
||||
@ cdecl __p__mbctype()
|
||||
|
@ -277,7 +277,7 @@
|
|||
@ stub __p__pwctype()
|
||||
@ cdecl __p__timezone() MSVCRT___p__timezone
|
||||
@ cdecl __p__tzname()
|
||||
@ cdecl __p__wcmdln()
|
||||
@ cdecl __p__wcmdln() MSVCRT___p__wcmdln
|
||||
@ cdecl __p__wenviron() MSVCRT___p__wenviron
|
||||
@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr
|
||||
@ cdecl __pctype_func() MSVCRT___pctype_func
|
||||
|
|
|
@ -180,7 +180,7 @@ int CDECL _get_wpgmptr(WCHAR** p)
|
|||
/***********************************************************************
|
||||
* __p__fmode (MSVCRT.@)
|
||||
*/
|
||||
int* CDECL __p__fmode(void) { return &MSVCRT__fmode; }
|
||||
int* CDECL MSVCRT___p__fmode(void) { return &MSVCRT__fmode; }
|
||||
|
||||
/***********************************************************************
|
||||
* _set_fmode (MSVCRT.@)
|
||||
|
@ -230,12 +230,12 @@ unsigned int* CDECL __p__winver(void) { return &MSVCRT__winver; }
|
|||
/*********************************************************************
|
||||
* __p__acmdln (MSVCRT.@)
|
||||
*/
|
||||
char** CDECL __p__acmdln(void) { return &MSVCRT__acmdln; }
|
||||
char** CDECL MSVCRT___p__acmdln(void) { return &MSVCRT__acmdln; }
|
||||
|
||||
/*********************************************************************
|
||||
* __p__wcmdln (MSVCRT.@)
|
||||
*/
|
||||
MSVCRT_wchar_t** CDECL __p__wcmdln(void) { return &MSVCRT__wcmdln; }
|
||||
MSVCRT_wchar_t** CDECL MSVCRT___p__wcmdln(void) { return &MSVCRT__wcmdln; }
|
||||
|
||||
/*********************************************************************
|
||||
* __p___argv (MSVCRT.@)
|
||||
|
|
|
@ -2097,7 +2097,7 @@ static unsigned split_oflags(unsigned oflags)
|
|||
else if (oflags & MSVCRT__O_WTEXT) wxflags |= WX_TEXT;
|
||||
else if (oflags & MSVCRT__O_U16TEXT) wxflags |= WX_TEXT;
|
||||
else if (oflags & MSVCRT__O_U8TEXT) wxflags |= WX_TEXT;
|
||||
else if (*__p__fmode() & MSVCRT__O_BINARY) {/* Nothing to do */}
|
||||
else if (*MSVCRT___p__fmode() & MSVCRT__O_BINARY) {/* Nothing to do */}
|
||||
else wxflags |= WX_TEXT; /* default to TEXT*/
|
||||
if (oflags & MSVCRT__O_NOINHERIT) wxflags |= WX_DONTINHERIT;
|
||||
|
||||
|
|
|
@ -1121,7 +1121,7 @@ int WINAPIV _cprintf(const char*,...);
|
|||
int WINAPIV _cwprintf(const MSVCRT_wchar_t*,...);
|
||||
char*** __cdecl MSVCRT___p__environ(void);
|
||||
int* __cdecl __p___mb_cur_max(void);
|
||||
int* __cdecl __p__fmode(void);
|
||||
int* __cdecl MSVCRT___p__fmode(void);
|
||||
MSVCRT_wchar_t* __cdecl MSVCRT__wcsdup(const MSVCRT_wchar_t*);
|
||||
MSVCRT_size_t __cdecl MSVCRT_strnlen(const char *,MSVCRT_size_t);
|
||||
MSVCRT_size_t __cdecl MSVCRT_wcsnlen(const MSVCRT_wchar_t*,MSVCRT_size_t);
|
||||
|
|
|
@ -252,14 +252,14 @@
|
|||
@ cdecl __p___mb_cur_max()
|
||||
@ cdecl __p___wargv() MSVCRT___p___wargv
|
||||
@ cdecl __p___winitenv()
|
||||
@ cdecl __p__acmdln()
|
||||
@ cdecl __p__acmdln() MSVCRT___p__acmdln
|
||||
@ cdecl __p__amblksiz()
|
||||
@ cdecl __p__commode()
|
||||
@ cdecl __p__daylight() MSVCRT___p__daylight
|
||||
@ cdecl __p__dstbias() MSVCRT___p__dstbias
|
||||
@ cdecl __p__environ() MSVCRT___p__environ
|
||||
@ stub __p__fileinfo()
|
||||
@ cdecl __p__fmode()
|
||||
@ cdecl __p__fmode() MSVCRT___p__fmode
|
||||
@ cdecl __p__iob() MSVCRT___iob_func
|
||||
@ stub __p__mbcasemap()
|
||||
@ cdecl __p__mbctype()
|
||||
|
@ -269,7 +269,7 @@
|
|||
@ stub __p__pwctype()
|
||||
@ cdecl __p__timezone() MSVCRT___p__timezone
|
||||
@ cdecl __p__tzname()
|
||||
@ cdecl __p__wcmdln()
|
||||
@ cdecl __p__wcmdln() MSVCRT___p__wcmdln
|
||||
@ cdecl __p__wenviron() MSVCRT___p__wenviron
|
||||
@ cdecl __p__winmajor()
|
||||
@ cdecl __p__winminor()
|
||||
|
|
|
@ -1055,7 +1055,7 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc
|
|||
if (!command || !mode)
|
||||
return NULL;
|
||||
|
||||
textmode = *__p__fmode() & (MSVCRT__O_BINARY | MSVCRT__O_TEXT);
|
||||
textmode = *MSVCRT___p__fmode() & (MSVCRT__O_BINARY | MSVCRT__O_TEXT);
|
||||
for (p = mode; *p; p++)
|
||||
{
|
||||
switch (*p)
|
||||
|
|
|
@ -124,14 +124,14 @@
|
|||
@ cdecl __p___argc() MSVCRT___p___argc
|
||||
@ cdecl __p___argv() MSVCRT___p___argv
|
||||
@ cdecl __p___wargv() MSVCRT___p___wargv
|
||||
@ cdecl __p__acmdln()
|
||||
@ cdecl __p__acmdln() MSVCRT___p__acmdln
|
||||
@ cdecl __p__commode()
|
||||
@ cdecl __p__environ() MSVCRT___p__environ
|
||||
@ cdecl __p__fmode()
|
||||
@ cdecl __p__fmode() MSVCRT___p__fmode
|
||||
@ stub __p__mbcasemap()
|
||||
@ cdecl __p__mbctype()
|
||||
@ cdecl __p__pgmptr() MSVCRT___p__pgmptr
|
||||
@ cdecl __p__wcmdln()
|
||||
@ cdecl __p__wcmdln() MSVCRT___p__wcmdln
|
||||
@ cdecl __p__wenviron() MSVCRT___p__wenviron
|
||||
@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr
|
||||
@ cdecl __pctype_func() MSVCRT___pctype_func
|
||||
|
|
Loading…
Reference in New Issue