msvcrt: Don't include MSVC 14.0 console functions in SOs for older DLLs.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Don't include MSVC 14.0 console functions in SOs for older DLLs.
160175a8 · Alex Henrie · Alexandre Julliard · c5fbeb5f · 160175a8
Commit 160175a8 authored Jan 03, 2018 by Alex Henrie Committed by Alexandre Julliard Jan 03, 2018
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

console.c dlls/msvcrt/console.c +6 -2

No files found.
--- 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 */