aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-04-02 13:46:21 +0000
committermarha <marha@users.sourceforge.net>2010-04-02 13:46:21 +0000
commit0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b (patch)
tree7f9e41630a661eaab39bef9023c2661a7281af96 /xorg-server/hw/xfree86/os-support/shared/posix_tty.c
parent8def4a30414ae76e228f285ccab8bba6de083d08 (diff)
downloadvcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.tar.gz
vcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.tar.bz2
vcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.zip
svn merge -r522:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/os-support/shared/posix_tty.c')
-rw-r--r--xorg-server/hw/xfree86/os-support/shared/posix_tty.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/xorg-server/hw/xfree86/os-support/shared/posix_tty.c b/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
index bf1bb03a3..4ba8599ab 100644
--- a/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
+++ b/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
@@ -137,19 +137,9 @@ xf86OpenSerial (pointer options)
if (!isatty (fd))
{
-#if 1
/* Allow non-tty devices to be opened. */
xfree(dev);
return (fd);
-#else
- xf86Msg (X_WARNING,
- "xf86OpenSerial: Specified device %s is not a tty\n",
- dev);
- SYSCALL (close (fd));
- errno = EINVAL;
- xfree(dev);
- return (-1);
-#endif
}
/* set up default port parameters */