[PATCH] msvcrt: Don't include MSVC 14.0 console functions in SOs for older DLLs
Alex Henrie
alexhenrie24 at gmail.com
Wed Jan 3 02:07:41 CST 2018
Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
dlls/msvcrt/console.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c
index 39b488082f..75e95ebcfc 100644
--- a/dlls/msvcrt/console.c
+++ b/dlls/msvcrt/console.c
@@ -561,8 +561,10 @@ int WINAPIV _cwprintf(const MSVCRT_wchar_t* format, ...)
return retval;
}
+#if _MSVCR_VER>=140
+
/*********************************************************************
- * __conio_common_vcprintf (MSVCRT.@)
+ * __conio_common_vcprintf (UCRTBASE.@)
*/
int CDECL MSVCRT__conio_common_vcprintf(unsigned __int64 options, const char* format,
MSVCRT__locale_t locale, __ms_va_list valist)
@@ -574,7 +576,7 @@ int CDECL MSVCRT__conio_common_vcprintf(unsigned __int64 options, const char* fo
}
/*********************************************************************
- * __conio_common_vcwprintf (MSVCRT.@)
+ * __conio_common_vcwprintf (UCRTBASE.@)
*/
int CDECL MSVCRT__conio_common_vcwprintf(unsigned __int64 options, const MSVCRT_wchar_t* format,
MSVCRT__locale_t locale, __ms_va_list valist)
@@ -584,3 +586,5 @@ int CDECL MSVCRT__conio_common_vcwprintf(unsigned __int64 options, const MSVCRT_
return pf_printf_w(puts_clbk_console_w, NULL, format, locale,
options & UCRTBASE_PRINTF_MASK, arg_clbk_valist, NULL, &valist);
}
+
+#endif /* _MSVCR_VER>=140 */
--
2.15.1
More information about the wine-devel
mailing list