aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/os-support/linux
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-11-26 15:22:07 +0000
committermarha <marha@users.sourceforge.net>2010-11-26 15:22:07 +0000
commit57818d0fe4f7cf94279909f03ec11b326b284f1e (patch)
tree88487618bf9c63429ea49574b110854ff8ca28b9 /xorg-server/hw/xfree86/os-support/linux
parent6fda93be42ace9eeab0e82ceebb6798961c9105c (diff)
downloadvcxsrv-57818d0fe4f7cf94279909f03ec11b326b284f1e.tar.gz
vcxsrv-57818d0fe4f7cf94279909f03ec11b326b284f1e.tar.bz2
vcxsrv-57818d0fe4f7cf94279909f03ec11b326b284f1e.zip
libXext xserver libfontenc libX11 libxcb pixman git update 26 11 2010
Diffstat (limited to 'xorg-server/hw/xfree86/os-support/linux')
-rw-r--r--xorg-server/hw/xfree86/os-support/linux/lnx_init.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/os-support/linux/lnx_init.c b/xorg-server/hw/xfree86/os-support/linux/lnx_init.c
index 7be65dcf9..7adf0ff73 100644
--- a/xorg-server/hw/xfree86/os-support/linux/lnx_init.c
+++ b/xorg-server/hw/xfree86/os-support/linux/lnx_init.c
@@ -85,7 +85,11 @@ static void *console_handler;
static void
drain_console(int fd, void *closure)
{
- tcflush(fd, TCIOFLUSH);
+ errno = 0;
+ if (tcflush(fd, TCIOFLUSH) == -1 && errno == EIO) {
+ xf86RemoveGeneralHandler(console_handler);
+ console_handler = NULL;
+ }
}
void