branch update for HEAD-2003021201

[reactos.git] / lib / crtdll / stdio / sscanf.c

diff --git a/lib/crtdll/stdio/sscanf.c b/lib/crtdll/stdio/sscanf.c
index a81dde4..c0ccbb3 100644 (file)
--- a/lib/crtdll/stdio/sscanf.c
+++ b/lib/crtdll/stdio/sscanf.c
@@ -16,14 +16,13 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <stdarg.h>
-#include <crtdll/stdio.h>
-#include <crtdll/wchar.h>
-#include <crtdll/alloc.h>
+#include <msvcrt/stdarg.h>
+#include <msvcrt/stdio.h>
+#include <msvcrt/wchar.h>
+#include <msvcrt/alloc.h>
+#include <msvcrt/internal/stdio.h>
 
 
-int __vsscanf (const char *s,const char *format,va_list arg);
-
 /* Read formatted input from S, according to the format string FORMAT.  */
 /* VARARGS2 */
 int sscanf (const char *s,const char *format, ...)
@@ -38,17 +37,7 @@ int sscanf (const char *s,const char *format, ...)
   return done;
 }
 
-#ifdef USE_IN_LIBIO
-# undef _IO_sscanf
-/* This is for libg++.  */
-strong_alias (sscanf, _IO_sscanf)
-#endif
-
-
-
-
-int
-swscanf(const wchar_t *str, const wchar_t *fmt, ...)
+int swscanf(const wchar_t *str, const wchar_t *fmt, ...)
 {
   va_list arg;
   int done;
@@ -71,9 +60,6 @@ swscanf(const wchar_t *str, const wchar_t *fmt, ...)
   va_end (arg);
 
   free(f);
-  return done;
-
 
+  return done;
 }
-
-