Module: wine Branch: master Commit: 7e86ab3df61589509feb20363920b45285646a5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e86ab3df61589509feb203639...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Wed Dec 23 01:14:29 2015 +0300
msvcrt: Fix cwscanf* prototypes.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/msvcrt/scanf.c | 8 ++++---- dlls/msvcrt/scanf.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index a19d450..8c9cd87 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -550,7 +550,7 @@ int CDECL _cscanf_s_l(const char *format, MSVCRT__locale_t locale, ...) /********************************************************************* * _cwscanf (MSVCRT.@) */ -int CDECL _cwscanf(const char *format, ...) +int CDECL _cwscanf(const MSVCRT_wchar_t *format, ...) { __ms_va_list valist; int res; @@ -564,7 +564,7 @@ int CDECL _cwscanf(const char *format, ...) /********************************************************************* * _cwscanf_l (MSVCRT.@) */ -int CDECL _cwscanf_l(const char *format, MSVCRT__locale_t locale, ...) +int CDECL _cwscanf_l(const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ...) { __ms_va_list valist; int res; @@ -578,7 +578,7 @@ int CDECL _cwscanf_l(const char *format, MSVCRT__locale_t locale, ...) /********************************************************************* * _cwscanf_s (MSVCRT.@) */ -int CDECL _cwscanf_s(const char *format, ...) +int CDECL _cwscanf_s(const MSVCRT_wchar_t *format, ...) { __ms_va_list valist; int res; @@ -592,7 +592,7 @@ int CDECL _cwscanf_s(const char *format, ...) /********************************************************************* * _cwscanf_s_l (MSVCRT.@) */ -int CDECL _cwscanf_s_l(const char *format, MSVCRT__locale_t locale, ...) +int CDECL _cwscanf_s_l(const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ...) { __ms_va_list valist; int res; diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 5bf91a6..b2e6bd7 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -52,9 +52,9 @@ #define _UNLOCK_FILE_(file) MSVCRT__unlock_file(MSVCRT_stdin) #ifdef WIDE_SCANF #ifdef SECURE -#define _FUNCTION_ static int MSVCRT_vcwscanf_s_l(const char *format, MSVCRT__locale_t locale, __ms_va_list ap) +#define _FUNCTION_ static int MSVCRT_vcwscanf_s_l(const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list ap) #else /* SECURE */ -#define _FUNCTION_ static int MSVCRT_vcwscanf_l(const char *format, MSVCRT__locale_t locale, __ms_va_list ap) +#define _FUNCTION_ static int MSVCRT_vcwscanf_l(const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list ap) #endif /* SECURE */ #else /* WIDE_SCANF */ #ifdef SECURE