Alexandre Julliard : msvcp: Rename clog variable to avoid conflict with builtin function.
Alexandre Julliard
julliard at winehq.org
Wed Apr 10 15:19:59 CDT 2019
Module: wine
Branch: master
Commit: 8b7b4e514035c40151b5704be37eb5555e768a65
URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b7b4e514035c40151b5704be37eb5555e768a65
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Apr 10 19:08:42 2019 +0200
msvcp: Rename clog variable to avoid conflict with builtin function.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcp100/msvcp100.spec | 2 +-
dlls/msvcp110/msvcp110.spec | 2 +-
dlls/msvcp120/msvcp120.spec | 2 +-
dlls/msvcp140/msvcp140.spec | 2 +-
dlls/msvcp70/msvcp70.spec | 2 +-
dlls/msvcp71/msvcp71.spec | 2 +-
dlls/msvcp80/msvcp80.spec | 2 +-
dlls/msvcp90/ios.c | 12 ++++++------
dlls/msvcp90/msvcp90.spec | 2 +-
9 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec
index 55217a6..2ae4e4c 100644
--- a/dlls/msvcp100/msvcp100.spec
+++ b/dlls/msvcp100/msvcp100.spec
@@ -1309,7 +1309,7 @@
@ cdecl -arch=win64 ?clear at ios_base@std@@QEAAXH_N at Z(ptr long long) ios_base_clear_reraise
@ thiscall -arch=win32 ?clear at ios_base@std@@QAEXI at Z(ptr long) ios_base_clear_unsigned
@ cdecl -arch=win64 ?clear at ios_base@std@@QEAAXI at Z(ptr long) ios_base_clear_unsigned
-@ 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 ?copyfmt@?$basic_ios at DU?$char_traits at D@std@@@std@@QAEAAV12 at ABV12@@Z(ptr ptr) basic_ios_char_copyfmt
@ cdecl -arch=win64 ?copyfmt@?$basic_ios at DU?$char_traits at D@std@@@std@@QEAAAEAV12 at AEBV12@@Z(ptr ptr) basic_ios_char_copyfmt
@ thiscall -arch=win32 ?copyfmt@?$basic_ios at GU?$char_traits at G@std@@@std@@QAEAAV12 at ABV12@@Z(ptr ptr) basic_ios_wchar_copyfmt
diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec
index 882dbbe..5f2b664 100644
--- a/dlls/msvcp110/msvcp110.spec
+++ b/dlls/msvcp110/msvcp110.spec
@@ -1892,7 +1892,7 @@
@ cdecl -arch=arm ?clear at ios_base@std@@QAAXI at Z(ptr long) ios_base_clear_unsigned
@ thiscall -arch=i386 ?clear at ios_base@std@@QAEXI at Z(ptr long) ios_base_clear_unsigned
@ cdecl -arch=win64 ?clear at ios_base@std@@QEAAXI at Z(ptr long) ios_base_clear_unsigned
-@ 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
@ cdecl -arch=arm ?copyfmt@?$basic_ios at DU?$char_traits at D@std@@@std@@QAAAAV12 at ABV12@@Z(ptr ptr) basic_ios_char_copyfmt
@ thiscall -arch=i386 ?copyfmt@?$basic_ios at DU?$char_traits at D@std@@@std@@QAEAAV12 at ABV12@@Z(ptr ptr) basic_ios_char_copyfmt
@ cdecl -arch=win64 ?copyfmt@?$basic_ios at DU?$char_traits at D@std@@@std@@QEAAAEAV12 at AEBV12@@Z(ptr ptr) basic_ios_char_copyfmt
diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec
index 73024a0..c2a2d7e 100644
--- a/dlls/msvcp120/msvcp120.spec
+++ b/dlls/msvcp120/msvcp120.spec
@@ -1852,7 +1852,7 @@
@ cdecl -arch=arm ?clear at ios_base@std@@QAAXI at Z(ptr long) ios_base_clear_unsigned
@ thiscall -arch=i386 ?clear at ios_base@std@@QAEXI at Z(ptr long) ios_base_clear_unsigned
@ cdecl -arch=win64 ?clear at ios_base@std@@QEAAXI at Z(ptr long) ios_base_clear_unsigned
-@ 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
@ cdecl -arch=arm ?copyfmt@?$basic_ios at DU?$char_traits at D@std@@@std@@QAAAAV12 at ABV12@@Z(ptr ptr) basic_ios_char_copyfmt
@ thiscall -arch=i386 ?copyfmt@?$basic_ios at DU?$char_traits at D@std@@@std@@QAEAAV12 at ABV12@@Z(ptr ptr) basic_ios_char_copyfmt
@ cdecl -arch=win64 ?copyfmt@?$basic_ios at DU?$char_traits at D@std@@@std@@QEAAAEAV12 at AEBV12@@Z(ptr ptr) basic_ios_char_copyfmt
diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec
index 96dff34..5bd627c 100644
--- a/dlls/msvcp140/msvcp140.spec
+++ b/dlls/msvcp140/msvcp140.spec
@@ -1757,7 +1757,7 @@
@ cdecl -arch=win64 ?clear at ios_base@std@@QEAAXH at Z(ptr long) ios_base_clear
@ cdecl -arch=win64 ?clear at ios_base@std@@QEAAXH_N at Z(ptr long long) ios_base_clear_reraise
@ cdecl -arch=win64 ?clear at ios_base@std@@QEAAXI at Z(ptr long) ios_base_clear_unsigned
-@ 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
@ cdecl -arch=arm ?copyfmt@?$basic_ios at DU?$char_traits at D@std@@@std@@QAAAAV12 at ABV12@@Z(ptr ptr) basic_ios_char_copyfmt
@ thiscall -arch=i386 ?copyfmt@?$basic_ios at DU?$char_traits at D@std@@@std@@QAEAAV12 at ABV12@@Z(ptr ptr) basic_ios_char_copyfmt
@ cdecl -arch=win64 ?copyfmt@?$basic_ios at DU?$char_traits at D@std@@@std@@QEAAAEAV12 at AEBV12@@Z(ptr ptr) basic_ios_char_copyfmt
diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec
index 4e75c20..b7c97a3 100644
--- a/dlls/msvcp70/msvcp70.spec
+++ b/dlls/msvcp70/msvcp70.spec
@@ -2433,7 +2433,7 @@
@ cdecl -arch=win64 ?clear at ios_base@std@@QEAAXH_N at Z(ptr long long) ios_base_clear_reraise
@ thiscall -arch=i386 ?clear at ios_base@std@@QAEXI at Z(ptr long) ios_base_clear_unsigned
@ cdecl -arch=win64 ?clear at ios_base@std@@QEAAXI at Z(ptr long) ios_base_clear_unsigned
-@ 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
diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec
index 6d3e931..ff6de62 100644
--- a/dlls/msvcp71/msvcp71.spec
+++ b/dlls/msvcp71/msvcp71.spec
@@ -2624,7 +2624,7 @@
@ cdecl -arch=win64 ?clear at ios_base@std@@QEAAXH_N at Z(ptr long long) ios_base_clear_reraise
@ thiscall -arch=win32 ?clear at ios_base@std@@QAEXI at Z(ptr long) ios_base_clear_unsigned
@ cdecl -arch=win64 ?clear at ios_base@std@@QEAAXI at Z(ptr long) ios_base_clear_unsigned
-@ 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
diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec
index 8cf9e54..8a2f695 100644
--- a/dlls/msvcp80/msvcp80.spec
+++ b/dlls/msvcp80/msvcp80.spec
@@ -3047,7 +3047,7 @@
@ cdecl -arch=win64 ?clear at ios_base@std@@QEAAXH_N at Z(ptr long long) ios_base_clear_reraise
@ thiscall -arch=i386 ?clear at ios_base@std@@QAEXI at Z(ptr long) ios_base_clear_unsigned
@ cdecl -arch=win64 ?clear at ios_base@std@@QEAAXI at Z(ptr long) ios_base_clear_unsigned
-@ 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
diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c
index 7f792d6..6b94737 100644
--- a/dlls/msvcp90/ios.c
+++ b/dlls/msvcp90/ios.c
@@ -15454,11 +15454,11 @@ struct {
int vtordisp;
#endif
basic_ios_char vbase;
-} clog = { { 0 } };
-C_ASSERT(sizeof(clog) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_char, 0)+sizeof(basic_ios_char));
+} MSVCP_clog = { { 0 } };
+C_ASSERT(sizeof(MSVCP_clog) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_char, 0)+sizeof(basic_ios_char));
/* ?_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 */
@@ -15529,7 +15529,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);
}
}
@@ -15907,7 +15907,7 @@ void init_io(void *base)
basic_ostream_wchar_ctor(&wcerr.obj, &filebuf_wchar_stderr.base, FALSE/*FIXME*/, TRUE);
basic_filebuf_char_ctor_file(&filebuf_char_log, stderr);
- basic_ostream_char_ctor(&clog.obj, &filebuf_char_log.base, FALSE/*FIXME*/, TRUE);
+ basic_ostream_char_ctor(&MSVCP_clog.obj, &filebuf_char_log.base, FALSE/*FIXME*/, TRUE);
basic_filebuf_short_ctor_file(&filebuf_short_log, stderr);
basic_ostream_short_ctor(&uclog.obj, &filebuf_short_log.base, FALSE/*FIXME*/, TRUE);
@@ -15945,7 +15945,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/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec
index 1df283a..2c1c0d7 100644
--- a/dlls/msvcp90/msvcp90.spec
+++ b/dlls/msvcp90/msvcp90.spec
@@ -3411,7 +3411,7 @@
@ cdecl -arch=arm ?clear at ios_base@std@@QAAXI at Z(ptr long) ios_base_clear_unsigned
@ thiscall -arch=i386 ?clear at ios_base@std@@QAEXI at Z(ptr long) ios_base_clear_unsigned
@ cdecl -arch=win64 ?clear at ios_base@std@@QEAAXI at Z(ptr long) ios_base_clear_unsigned
-@ 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