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

msvcirt: 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:59 +02:00
parent 403674a974
commit e79b0fd752
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/msvcirt/msvcirt.c
View File

@ -332,7 +332,7 @@ struct {
struct {
ostream os;
ios vbase;
} cout = { { 0 } }, cerr = { { 0 } }, clog = { { 0 } };
} cout = { { 0 } }, cerr = { { 0 } }, MSVCP_clog = { { 0 } };
/* ??0streambuf@@IAE@PADH@Z */
@ -4455,11 +4455,11 @@ void __cdecl ios_sync_with_stdio(void)
if ((new_buf = MSVCRT_operator_new(sizeof(stdiobuf)))) {
stdiobuf_file_ctor(new_buf, stderr);
stdiobuf_setrwbuf(new_buf, 0, 512);
ostream_assign_sb(&clog.os, &new_buf->base);
ostream_assign_sb(&MSVCP_clog.os, &new_buf->base);
} else
ostream_assign_sb(&clog.os, NULL);
clog.vbase.delbuf = 1;
ios_setf(&clog.vbase, FLAGS_stdio);
ostream_assign_sb(&MSVCP_clog.os, NULL);
MSVCP_clog.vbase.delbuf = 1;
ios_setf(&MSVCP_clog.vbase, FLAGS_stdio);
}
}
@ -4555,10 +4555,10 @@ static void init_io(void *base)
if ((fb = MSVCRT_operator_new(sizeof(filebuf)))) {
filebuf_fd_ctor(fb, 2);
ostream_withassign_sb_ctor(&clog.os, &fb->base, TRUE);
ostream_withassign_sb_ctor(&MSVCP_clog.os, &fb->base, TRUE);
} else
ostream_withassign_sb_ctor(&clog.os, NULL, TRUE);
Iostream_init_ios_ctor(NULL, &clog.vbase, 0);
ostream_withassign_sb_ctor(&MSVCP_clog.os, NULL, TRUE);
Iostream_init_ios_ctor(NULL, &MSVCP_clog.vbase, 0);
}
static void free_io(void)
@ -4567,7 +4567,7 @@ static void free_io(void)
istream_vbase_dtor(&cin.is);
ostream_vbase_dtor(&cout.os);
ostream_vbase_dtor(&cerr.os);
ostream_vbase_dtor(&clog.os);
ostream_vbase_dtor(&MSVCP_clog.os);
}
BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )

2
dlls/msvcirt/msvcirt.spec
View File

@ -423,7 +423,7 @@
@ extern ?cin@@3Vistream_withassign@@A cin
@ thiscall -arch=win32 ?clear@ios@@QAEXH@Z(ptr long) ios_clear
@ cdecl -arch=win64 ?clear@ios@@QEAAXH@Z(ptr long) ios_clear
@ extern ?clog@@3Vostream_withassign@@A clog
@ extern ?clog@@3Vostream_withassign@@A MSVCP_clog
@ thiscall -arch=win32 ?close@filebuf@@QAEPAV1@XZ(ptr) filebuf_close
@ cdecl -arch=win64 ?close@filebuf@@QEAAPEAV1@XZ(ptr) filebuf_close
@ stub -arch=win32 ?close@fstream@@QAEXXZ # void __thiscall fstream::close(void)