diff options
| author | marha <marha@users.sourceforge.net> | 2010-11-30 10:03:09 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-11-30 10:03:09 +0000 |
| commit | 3e2f3f105cfe65384d2adeb2bd678850d9be47f9 (patch) | |
| tree | 1c3e43a774683e6e47cbd2293679b7115fbaa3cb /xorg-server/hw/xfree86/os-support/linux/lnx_init.c | |
| parent | fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7 (diff) | |
| parent | 57818d0fe4f7cf94279909f03ec11b326b284f1e (diff) | |
| download | vcxsrv-3e2f3f105cfe65384d2adeb2bd678850d9be47f9.tar.gz vcxsrv-3e2f3f105cfe65384d2adeb2bd678850d9be47f9.tar.bz2 vcxsrv-3e2f3f105cfe65384d2adeb2bd678850d9be47f9.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/os-support/linux/lnx_init.c')
| -rw-r--r-- | xorg-server/hw/xfree86/os-support/linux/lnx_init.c | 6 |
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
|