Alexandre Julliard : msvcirt: Rename clog variable to avoid conflict with builtin function.
Alexandre Julliard
julliard at winehq.org
Thu Apr 11 13:10:30 CDT 2019
Module: wine
Branch: master
Commit: e79b0fd7524fff38a289dd81120abb9764892a43
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e79b0fd7524fff38a289dd81120abb9764892a43
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Apr 11 10:13:59 2019 +0200
msvcirt: Rename clog variable to avoid conflict with builtin function.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcirt/msvcirt.c | 18 +++++++++---------
dlls/msvcirt/msvcirt.spec | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c
index 7f48346..c129e0f 100644
--- a/dlls/msvcirt/msvcirt.c
+++ b/dlls/msvcirt/msvcirt.c
@@ -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 at 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 )
diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec
index 2e5154c..f2e8756 100644
--- a/dlls/msvcirt/msvcirt.spec
+++ b/dlls/msvcirt/msvcirt.spec
@@ -423,7 +423,7 @@
@ extern ?cin@@3Vistream_withassign@@A cin
@ thiscall -arch=win32 ?clear at ios@@QAEXH at Z(ptr long) ios_clear
@ cdecl -arch=win64 ?clear at ios@@QEAAXH at Z(ptr long) ios_clear
-@ extern ?clog@@3Vostream_withassign@@A clog
+@ extern ?clog@@3Vostream_withassign@@A MSVCP_clog
@ thiscall -arch=win32 ?close at filebuf@@QAEPAV1 at XZ(ptr) filebuf_close
@ cdecl -arch=win64 ?close at filebuf@@QEAAPEAV1 at XZ(ptr) filebuf_close
@ stub -arch=win32 ?close at fstream@@QAEXXZ # void __thiscall fstream::close(void)
More information about the wine-cvs
mailing list