From bcd6451e5b17afb09d0a23bf0d21d10f8d9e5fba Mon Sep 17 00:00:00 2001 From: Aleksey Bragin Date: Wed, 4 Jun 2008 10:52:54 +0000 Subject: [PATCH] - libcntpr does not need console/file versions of scanf. svn path=/trunk/; revision=33854 --- reactos/lib/sdk/crt/wine/scanf.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/reactos/lib/sdk/crt/wine/scanf.c b/reactos/lib/sdk/crt/wine/scanf.c index 06a68d99169..d3269c95eb8 100644 --- a/reactos/lib/sdk/crt/wine/scanf.c +++ b/reactos/lib/sdk/crt/wine/scanf.c @@ -57,6 +57,7 @@ static int wchar2digit(wchar_t c, int base) { return -1; } +#ifndef _LIBCNT_ /* vfscanf */ #undef WIDE_SCANF #undef CONSOLE @@ -68,6 +69,7 @@ static int wchar2digit(wchar_t c, int base) { #undef CONSOLE #undef STRING #include "scanf.h" +#endif /* vsscanf */ #undef WIDE_SCANF @@ -81,6 +83,7 @@ static int wchar2digit(wchar_t c, int base) { #define STRING 1 #include "scanf.h" +#ifndef _LIBCNT_ /* vcscanf */ #undef WIDE_SCANF #define CONSOLE 1 @@ -144,6 +147,7 @@ int wscanf(const wchar_t *format, ...) va_end(valist); return res; } +#endif /********************************************************************* @@ -175,7 +179,7 @@ int swscanf(const wchar_t *str, const wchar_t *format, ...) return res; } - +#ifndef _LIBCNT_ /********************************************************************* * _cscanf (MSVCRT.@) */ @@ -189,3 +193,4 @@ int _cscanf(/*const*/ char *format, ...) va_end(valist); return res; } +#endif