X-Git-Url: http://git.jankratochvil.net/?p=reactos.git;a=blobdiff_plain;f=lib%2Fcrtdll%2Fconio%2Fgetch.c;h=070a867fcad72f4c762da9457a32f7eff86da03d;hp=6830ac5988c9ca64d47a7306e694eb96bbf3f356;hb=03af8776dc14167b078911b0c7c5327d1bcdd128;hpb=f4077c1bf64ef89d74a8d4822d2d7aada3ba9927

diff --git a/lib/crtdll/conio/getch.c b/lib/crtdll/conio/getch.c
index 6830ac5..070a867 100644
--- a/lib/crtdll/conio/getch.c
+++ b/lib/crtdll/conio/getch.c
@@ -8,32 +8,40 @@
  *              28/12/98: Created
  */
 #include <windows.h>
-#include <crtdll/conio.h>
-#include <crtdll/stdio.h>
-#include <crtdll/io.h>
+#include <msvcrt/conio.h>
+#include <msvcrt/stdio.h>
+#include <msvcrt/io.h>
+#include <msvcrt/internal/console.h>
 
-extern int char_avail;
-extern int ungot_char;
 
+int _getch(void)
+{
+    DWORD  NumberOfCharsRead = 0;
+    char c;
+    if (char_avail) {
+        c = ungot_char;
+        char_avail = 0;
+    } else {
+        ReadConsoleA(_get_osfhandle(stdin->_file),
+		             &c,
+		             1,
+		             &NumberOfCharsRead,
+		             NULL);
+    }
+    if (c == 10)
+        c = 13;
+    putchar(c);
+    return c;
+}
 
-int
-_getch(void)
+#if 0
+int _getche(void)
 {
-  
-  DWORD  NumberOfCharsRead = 0;
-  char c;
-  if (char_avail)
-  {
-    c = ungot_char;
-    char_avail = 0;
-  }
-  else
-  {	
-	ReadConsoleA(_get_osfhandle(stdin->_file), &c,1,&NumberOfCharsRead ,NULL);
-	
-  }
-  if ( c == 10 )
-	c = 13;
-  putchar(c);
-  return c;
+    int c;
+
+    c = _getch();
+    _putch(c);
+
+    return c;
 }
+#endif