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

msvcp60: Rename clog variable to avoid conflict with builtin function. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2019-04-11 10:13:49 +02:00
parent d97d922afd
commit 403674a974
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/msvcp60/ios.c
View File

@ -13873,10 +13873,10 @@ static basic_filebuf_char filebuf_char_log;
struct {
basic_ostream_char obj;
basic_ios_char vbase;
} clog = { { 0 } };
} MSVCP_clog = { { 0 } };
/* ?_Ptr_clog@std@@3PAV?$basic_ostream@DU?$char_traits@D@std@@@1@A */
/* ?_Ptr_clog@std@@3PEAV?$basic_ostream@DU?$char_traits@D@std@@@1@EA */
basic_ostream_char *_Ptr_clog = &clog.obj;
basic_ostream_char *_Ptr_clog = &MSVCP_clog.obj;
static basic_filebuf_wchar filebuf_short_log;
/* ?wclog@std@@3V?$basic_ostream@GU?$char_traits@G@std@@@1@A */
@ -13939,7 +13939,7 @@ void __cdecl ios_base_Init__Init_dtor(void *this)
if(!ios_base_Init__Init_cnt) {
basic_ostream_char_flush(&cout.obj);
basic_ostream_char_flush(&cerr.obj);
basic_ostream_char_flush(&clog.obj);
basic_ostream_char_flush(&MSVCP_clog.obj);
}
}
@ -14079,7 +14079,7 @@ void init_io(void *base)
basic_ostream_short_ctor(&wcerr.obj, &filebuf_wchar_stderr.base, FALSE/*FIXME*/, TRUE, TRUE);
basic_filebuf_char_ctor_file(&filebuf_char_log, stderr);
basic_ostream_char_ctor(&clog.obj, &filebuf_char_log.base, FALSE/*FIXME*/, TRUE, TRUE);
basic_ostream_char_ctor(&MSVCP_clog.obj, &filebuf_char_log.base, FALSE/*FIXME*/, TRUE, TRUE);
basic_filebuf_short_ctor_file(&filebuf_short_log, stderr);
basic_ostream_short_ctor(&uclog.obj, &filebuf_short_log.base, FALSE/*FIXME*/, TRUE, TRUE);
@ -14117,7 +14117,7 @@ void free_io(void)
basic_ostream_wchar_vbase_dtor(&wcerr.obj);
basic_filebuf_wchar_dtor(&filebuf_wchar_stderr);
basic_ostream_char_vbase_dtor(&clog.obj);
basic_ostream_char_vbase_dtor(&MSVCP_clog.obj);
basic_filebuf_char_dtor(&filebuf_char_log);
basic_ostream_wchar_vbase_dtor(&uclog.obj);

2
dlls/msvcp60/msvcp60.spec
View File

@ -2515,7 +2515,7 @@
@ stub -arch=win64 ?clear@ios_base@std@@QEAAXF@Z
@ thiscall -arch=win32 ?clear@ios_base@std@@QAEXH_N@Z(ptr long long) ios_base_clear_reraise
@ cdecl -arch=win64 ?clear@ios_base@std@@QEAAXH_N@Z(ptr long long) ios_base_clear_reraise
@ extern ?clog@std@@3V?$basic_ostream@DU?$char_traits@D@std@@@1@A clog
@ extern ?clog@std@@3V?$basic_ostream@DU?$char_traits@D@std@@@1@A MSVCP_clog
@ thiscall -arch=win32 ?close@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QAEPAV12@XZ(ptr) basic_filebuf_char_close
@ cdecl -arch=win64 ?close@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QEAAPEAV12@XZ(ptr) basic_filebuf_char_close
@ thiscall -arch=win32 ?close@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAEPAV12@XZ(ptr) basic_filebuf_wchar_close