branch update for HEAD-2003021201

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

diff --git a/lib/crtdll/stdio/putc.c b/lib/crtdll/stdio/putc.c
index 0764d07..8cc187b 100644 (file)
--- a/lib/crtdll/stdio/putc.c
+++ b/lib/crtdll/stdio/putc.c
@@ -1,18 +1,17 @@
 /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
 #include <windows.h>
-#include <crtdll/stdio.h>
-#include <crtdll/wchar.h>
-#include <crtdll/errno.h>
-#include <crtdll/internal/file.h>
+#include <msvcrt/stdio.h>
+#include <msvcrt/wchar.h>
+#include <msvcrt/errno.h>
+#include <msvcrt/internal/file.h>
 
 // putc can be a macro
 #undef putc
+#undef putwc
 
-int putc(int c, FILE *fp)
+int putc(int c, FILE* fp)
 {
-
-// valid stream macro should check that fp 
-// is dword aligned
+// valid stream macro should check that fp is dword aligned
        if (!__validfp (fp)) {
                __set_errno(EINVAL);
                return -1;
@@ -36,7 +35,9 @@ int putc(int c, FILE *fp)
        return EOF;
 }
 
-wint_t putwc(wchar_t c, FILE *fp)
+//wint_t putwc(wint_t c, FILE* fp)
+//int putwc(wchar_t c, FILE* fp)
+int putwc(wint_t c, FILE* fp)
 {
        // might check on multi bytes if text mode