update for HEAD-2003021201

[reactos.git] / lib / msvcrt / stdio / vprintf.c

diff --git a/lib/msvcrt/stdio/vprintf.c b/lib/msvcrt/stdio/vprintf.c
index f724749..33c74b8 100644 (file)
--- a/lib/msvcrt/stdio/vprintf.c
+++ b/lib/msvcrt/stdio/vprintf.c
@@ -21,27 +21,57 @@ Cambridge, MA 02139, USA.  */
 #include <msvcrt/stdio.h>
 #include <msvcrt/wchar.h>
 
+
 #undef vprintf
 #undef vwprintf
 
-/* Write formatted output to stdout according to the
-   format string FORMAT, using the argument list in ARG.  */
-int
-vprintf (format, arg)
-     const char *format;
-     va_list arg;
+//#define _USE_VARARG_
+
+#ifndef _USE_VARARG_
+
+int vprintf(const char* format, va_list arg)
+{
+    int ret;
+
+    ret = vfprintf(stdout, format, arg);
+    fflush(stdout);
+    return ret;
+}
+
+int vwprintf(const wchar_t* format, va_list arg)
+{
+    int ret;
+
+    ret = vfwprintf(stdout, format, arg);
+    fflush(stdout);
+    return ret;
+}
+
+#else
+
+int vprintf(const char* format, ...)
 {
-  int ret = vfprintf (stdout, format, arg);
-  fflush(stdout);
-  return ret;
+    va_list arg;
+    int ret;
+
+    va_start(arg, format);
+    ret = vfprintf(stdout, format, arg);
+    va_end(arg);
+
+    fflush(stdout);
+    return ret;
 }
 
-int
-vwprintf (format, arg)
-     const wchar_t *format;
-     va_list arg;
+int vwprintf(const wchar_t* format, ...)
 {
-  int ret = vfwprintf (stdout, format, arg);
-  fflush(stdout);
-  return ret;
+    va_list arg;
+    int ret;
+
+    va_start(arg, format);
+    ret = vfwprintf(stdout, format, arg);
+    va_end(arg);
+    fflush(stdout);
+    return ret;
 }
+
+#endif