*
* Win32 Console API support
*/
-#include "ghcconfig.h"
-#if defined(mingw32_HOST_OS) || defined(cygwin32_HOST_OS) || defined(__MINGW32__) || defined(_MSC_VER)
+#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_HOST_OS)
+#if defined(__CYGWIN__)
#define _get_osfhandle get_osfhandle
#endif
int
flush_input_console__(int fd)
{
- HANDLE h;
- if ( (h = (HANDLE)_get_osfhandle(fd)) != INVALID_HANDLE_VALUE ) {
+ 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;
}
return -1;
}
-#endif /* defined(mingw32_HOST_OS) || ... */
+#endif /* defined(__MINGW32__) || ... */