[PATCH 4/6] xfree86: Remove dead ifdefs from VT switching
Adam Jackson
ajax at redhat.com
Tue Aug 24 14:05:23 PDT 2010
Signed-off-by: Adam Jackson <ajax at redhat.com>
---
hw/xfree86/os-support/shared/VTsw_usl.c | 15 ---------------
1 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c
index d4ef0f7..818de17 100644
--- a/hw/xfree86/os-support/shared/VTsw_usl.c
+++ b/hw/xfree86/os-support/shared/VTsw_usl.c
@@ -31,10 +31,6 @@
#include "xf86Priv.h"
#include "xf86_OSlib.h"
-#ifdef OSHEADER
-# include OSHEADER
-#endif
-
/*
* Handle the VT-switching interface for OSs that use USL-style ioctl()s
* (the sysv, sco, and linux subdirs).
@@ -63,16 +59,9 @@ xf86VTSwitchAway(void)
{
xf86Info.vtRequestsPending = FALSE;
if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0)
- {
return FALSE;
- }
else
- {
-#ifdef OSSWITCHAWAY
- OSSWITCHAWAY;
-#endif
return TRUE;
- }
}
Bool
@@ -80,13 +69,9 @@ xf86VTSwitchTo(void)
{
xf86Info.vtRequestsPending = FALSE;
if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0)
- {
return FALSE;
- }
else
- {
return TRUE;
- }
}
Bool
--
1.7.2.1
More information about the xorg-devel
mailing list