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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 403674a9746fe195c7ca532f086a49f42f34274b
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=403674a9746fe195c7ca532f0...

Author: Alexandre Julliard 
Date:   Thu Apr 11 10:13:49 2019 +0200

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

Signed-off-by: Alexandre Julliard

---

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@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);
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@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