Author: fireball
Date: Wed Jun 4 05:52:54 2008
New Revision: 33854
URL:
http://svn.reactos.org/svn/reactos?rev=33854&view=rev
Log:
- libcntpr does not need console/file versions of scanf.
Modified:
trunk/reactos/lib/sdk/crt/wine/scanf.c
Modified: trunk/reactos/lib/sdk/crt/wine/scanf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/scanf.c?r…
==============================================================================
--- trunk/reactos/lib/sdk/crt/wine/scanf.c [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/wine/scanf.c [iso-8859-1] Wed Jun 4 05:52:54 2008
@@ -57,6 +57,7 @@
return -1;
}
+#ifndef _LIBCNT_
/* vfscanf */
#undef WIDE_SCANF
#undef CONSOLE
@@ -68,6 +69,7 @@
#undef CONSOLE
#undef STRING
#include "scanf.h"
+#endif
/* vsscanf */
#undef WIDE_SCANF
@@ -81,6 +83,7 @@
#define STRING 1
#include "scanf.h"
+#ifndef _LIBCNT_
/* vcscanf */
#undef WIDE_SCANF
#define CONSOLE 1
@@ -144,6 +147,7 @@
va_end(valist);
return res;
}
+#endif
/*********************************************************************
@@ -175,7 +179,7 @@
return res;
}
-
+#ifndef _LIBCNT_
/*********************************************************************
* _cscanf (MSVCRT.@)
*/
@@ -189,3 +193,4 @@
va_end(valist);
return res;
}
+#endif