X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=cbits%2FconsUtils.c;h=7c50c7b9b5b1ea0935f3272ba14ddfa51529626e;hb=fb52d2e61d4596588653d60c202c77768140cf81;hp=fd514408d3e4c4da2f5bf57de83799de960915fc;hpb=2f71a076d6210da9fe91641a8bf9787d13c58ee5;p=ghc-base.git

diff --git a/cbits/consUtils.c b/cbits/consUtils.c
index fd51440..7c50c7b 100644
--- a/cbits/consUtils.c
+++ b/cbits/consUtils.c
@@ -3,15 +3,14 @@
  *
  * Win32 Console API support
  */
-#include "config.h"
-#if defined(mingw32_TARGET_OS) || defined(cygwin32_TARGET_OS)
+#if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32) || defined(__CYGWIN__)
 /* to the end */
 
 #include "consUtils.h"
 #include <windows.h>
 #include <io.h>
 
-#if defined(cygwin32_TARGET_OS)
+#if defined(__CYGWIN__)
 #define _get_osfhandle get_osfhandle
 #endif
 
@@ -64,4 +63,26 @@ get_console_echo__(int fd)
     return -1;
 }
 
-#endif /* defined(mingw32_TARGET_OS) || defined(cygwin32_TARGET_OS) */
+int
+flush_input_console__(int fd)
+{
+    HANDLE h = (HANDLE)_get_osfhandle(fd);
+    
+    if ( h != INVALID_HANDLE_VALUE ) {
+	/* If the 'fd' isn't connected to a console; treat the flush
+	 * operation as a NOP.
+	 */
+	DWORD unused;
+	if ( !GetConsoleMode(h,&unused) &&
+	     GetLastError() == ERROR_INVALID_HANDLE ) {
+	    return 0;
+	}
+	if ( FlushConsoleInputBuffer(h) ) {
+	    return 0;
+	}
+    }
+    /* ToDo: translate GetLastError() into something errno-friendly */
+    return -1;
+}
+
+#endif /* defined(__MINGW32__) || ... */