Alexandre Julliard : msvcp60: 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: 403674a9746fe195c7ca532f086a49f42f34274b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=403674a9746fe195c7ca532f086a49f42f34274b
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Apr 11 10:13:49 2019 +0200
msvcp60: Rename clog variable to avoid conflict with builtin function.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcp60/ios.c | 10 +++++-----
dlls/msvcp60/msvcp60.spec | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c
index 079c4fa..f439339 100644
--- a/dlls/msvcp60/ios.c
+++ b/dlls/msvcp60/ios.c
@@ -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 at std@@3PAV?$basic_ostream at DU?$char_traits at D@std@@@1 at A */
/* ?_Ptr_clog at std@@3PEAV?$basic_ostream at DU?$char_traits at D@std@@@1 at EA */
-basic_ostream_char *_Ptr_clog = &clog.obj;
+basic_ostream_char *_Ptr_clog = &MSVCP_clog.obj;
static basic_filebuf_wchar filebuf_short_log;
/* ?wclog at std@@3V?$basic_ostream at GU?$char_traits at G@std@@@1 at 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);
diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec
index f496430..196ac6a 100644
--- a/dlls/msvcp60/msvcp60.spec
+++ b/dlls/msvcp60/msvcp60.spec
@@ -2515,7 +2515,7 @@
@ stub -arch=win64 ?clear at ios_base@std@@QEAAXF at Z
@ thiscall -arch=win32 ?clear at ios_base@std@@QAEXH_N at Z(ptr long long) ios_base_clear_reraise
@ cdecl -arch=win64 ?clear at ios_base@std@@QEAAXH_N at Z(ptr long long) ios_base_clear_reraise
-@ extern ?clog at std@@3V?$basic_ostream at DU?$char_traits at D@std@@@1 at A clog
+@ extern ?clog at std@@3V?$basic_ostream at DU?$char_traits at D@std@@@1 at A MSVCP_clog
@ thiscall -arch=win32 ?close@?$basic_filebuf at DU?$char_traits at D@std@@@std@@QAEPAV12 at XZ(ptr) basic_filebuf_char_close
@ cdecl -arch=win64 ?close@?$basic_filebuf at DU?$char_traits at D@std@@@std@@QEAAPEAV12 at XZ(ptr) basic_filebuf_char_close
@ thiscall -arch=win32 ?close@?$basic_filebuf at GU?$char_traits at G@std@@@std@@QAEPAV12 at XZ(ptr) basic_filebuf_wchar_close
More information about the wine-cvs
mailing list