- libcntpr does not need console/file versions of scanf.

svn path=/trunk/; revision=33854
This commit is contained in:
Aleksey Bragin 2008-06-04 10:52:54 +00:00
parent 7b68ed11e0
commit bcd6451e5b

View file

@ -57,6 +57,7 @@ static int wchar2digit(wchar_t c, int base) {
return -1; return -1;
} }
#ifndef _LIBCNT_
/* vfscanf */ /* vfscanf */
#undef WIDE_SCANF #undef WIDE_SCANF
#undef CONSOLE #undef CONSOLE
@ -68,6 +69,7 @@ static int wchar2digit(wchar_t c, int base) {
#undef CONSOLE #undef CONSOLE
#undef STRING #undef STRING
#include "scanf.h" #include "scanf.h"
#endif
/* vsscanf */ /* vsscanf */
#undef WIDE_SCANF #undef WIDE_SCANF
@ -81,6 +83,7 @@ static int wchar2digit(wchar_t c, int base) {
#define STRING 1 #define STRING 1
#include "scanf.h" #include "scanf.h"
#ifndef _LIBCNT_
/* vcscanf */ /* vcscanf */
#undef WIDE_SCANF #undef WIDE_SCANF
#define CONSOLE 1 #define CONSOLE 1
@ -144,6 +147,7 @@ int wscanf(const wchar_t *format, ...)
va_end(valist); va_end(valist);
return res; return res;
} }
#endif
/********************************************************************* /*********************************************************************
@ -175,7 +179,7 @@ int swscanf(const wchar_t *str, const wchar_t *format, ...)
return res; return res;
} }
#ifndef _LIBCNT_
/********************************************************************* /*********************************************************************
* _cscanf (MSVCRT.@) * _cscanf (MSVCRT.@)
*/ */
@ -189,3 +193,4 @@ int _cscanf(/*const*/ char *format, ...)
va_end(valist); va_end(valist);
return res; return res;
} }
#endif