ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Use iob_func instead of p__iob on non-x86.

This commit is contained in:
Alexandre Julliard 2008-12-11 21:13:20 +01:00
parent d8ab5a14aa
commit 4305e6d119
9 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msvcr71/msvcr71.spec
View File

@ -135,7 +135,7 @@
@ cdecl __p__environ() msvcrt.__p__environ
@ cdecl __p__fileinfo() msvcrt.__p__fileinfo
@ cdecl __p__fmode() msvcrt.__p__fmode
@ cdecl __p__iob() msvcrt.__p__iob
@ cdecl -arch=i386 __p__iob() msvcrt.__p__iob
@ cdecl __p__mbcasemap() msvcrt.__p__mbcasemap
@ cdecl __p__mbctype() msvcrt.__p__mbctype
@ cdecl __p__osver() msvcrt.__p__osver

4
dlls/msvcrt/file.c
View File

@ -451,9 +451,9 @@ static void msvcrt_int_to_base32(int num, char *str)
}
/*********************************************************************
* __p__iob(MSVCRT.@)
* __iob_func(MSVCRT.@)
*/
MSVCRT_FILE * CDECL __p__iob(void)
MSVCRT_FILE * CDECL MSVCRT___iob_func(void)
{
return &MSVCRT__iob[0];
}

4
dlls/msvcrt/main.c
View File

@ -67,10 +67,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
thread_data_t *tls;
TRACE("(%p, %s, %p) pid(%x), tid(%x), tls(%ld)\n",
TRACE("(%p, %s, %p) pid(%x), tid(%x), tls(%u)\n",
hinstDLL, msvcrt_get_reason(fdwReason), lpvReserved,
GetCurrentProcessId(), GetCurrentThreadId(),
(long)msvcrt_tls_index);
msvcrt_tls_index);
switch (fdwReason)
{

2
dlls/msvcrt/msvcrt.h
View File

@ -650,7 +650,7 @@ char* __cdecl MSVCRT_getenv(const char*);
char* __cdecl MSVCRT_setlocale(int,const char*);
int __cdecl MSVCRT_fclose(MSVCRT_FILE*);
void __cdecl MSVCRT_terminate(void);
MSVCRT_FILE* __cdecl MSVCRT__p__iob(void);
MSVCRT_FILE* __cdecl MSVCRT__iob_func(void);
MSVCRT_time_t __cdecl MSVCRT_mktime(struct MSVCRT_tm *t);
struct MSVCRT_tm* __cdecl MSVCRT_localtime(const MSVCRT_time_t* secs);
struct MSVCRT_tm* __cdecl MSVCRT_gmtime(const MSVCRT_time_t* secs);

4
dlls/msvcrt/msvcrt.spec
View File

@ -97,7 +97,7 @@
@ stub __get_app_type
@ cdecl __getmainargs(ptr ptr ptr long ptr)
@ extern __initenv MSVCRT___initenv
@ cdecl __iob_func() __p__iob
@ cdecl __iob_func() MSVCRT___iob_func
@ cdecl __isascii(long) MSVCRT___isascii
@ cdecl __iscsym(long) MSVCRT___iscsym
@ cdecl __iscsymf(long) MSVCRT___iscsymf
@ -121,7 +121,7 @@
@ cdecl __p__environ()
@ stub __p__fileinfo #()
@ cdecl __p__fmode()
@ cdecl __p__iob()
@ cdecl -arch=i386 __p__iob() MSVCRT___iob_func
@ stub __p__mbcasemap #()
@ cdecl __p__mbctype()
@ cdecl __p__osver()

2
dlls/msvcrt20/msvcrt20.spec
View File

@ -483,7 +483,7 @@
@ cdecl __p__daylight() msvcrt.__p__daylight
@ cdecl __p__environ() msvcrt.__p__environ
@ cdecl __p__fmode() msvcrt.__p__fmode
@ cdecl __p__iob() msvcrt.__p__iob
@ cdecl -arch=i386 __p__iob() msvcrt.__p__iob
@ cdecl __p__mbctype() msvcrt.__p__mbctype
@ cdecl __p__osver() msvcrt.__p__osver
@ cdecl __p__pctype() msvcrt.__p__pctype

2
dlls/msvcrt40/msvcrt40.spec
View File

@ -532,7 +532,7 @@
@ cdecl __p__dstbias() msvcrt.__p__dstbias
@ cdecl __p__environ() msvcrt.__p__environ
@ cdecl __p__fmode() msvcrt.__p__fmode
@ cdecl __p__iob() msvcrt.__p__iob
@ cdecl -arch=i386 __p__iob() msvcrt.__p__iob
@ cdecl __p__mbctype() msvcrt.__p__mbctype
@ cdecl __p__osver() msvcrt.__p__osver
@ cdecl __p__pctype() msvcrt.__p__pctype

2
dlls/msvcrtd/msvcrtd.spec
View File

@ -136,7 +136,7 @@
@ cdecl __p__environ() msvcrt.__p__environ
@ cdecl __p__fileinfo() msvcrt.__p__fileinfo
@ cdecl __p__fmode() msvcrt.__p__fmode
@ cdecl __p__iob() msvcrt.__p__iob
@ cdecl -arch=i386 __p__iob() msvcrt.__p__iob
@ cdecl __p__mbcasemap() msvcrt.__p__mbcasemap
@ cdecl __p__mbctype() msvcrt.__p__mbctype
@ cdecl __p__osver() msvcrt.__p__osver

9
include/msvcrt/stdio.h
View File

@ -81,8 +81,13 @@ extern "C" {
#endif
#ifndef _STDIO_DEFINED
FILE* __p__iob(void);
#define _iob (__p__iob())
# ifdef _WIN64 /* __p__iob is not exported in Win64 */
FILE* __iob_func(void);
# define _iob (__iob_func())
# else
FILE* __p__iob(void);
# define _iob (__p__iob())
# endif /* _WIN64 */
#endif /* _STDIO_DEFINED */
#define stdin (_iob+STDIN_FILENO)