xfree86: Remove dead ifdefs from VT switching
Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
parent
96a7a7d197
commit
0def735c6a
|
@ -31,10 +31,6 @@
|
||||||
#include "xf86Priv.h"
|
#include "xf86Priv.h"
|
||||||
#include "xf86_OSlib.h"
|
#include "xf86_OSlib.h"
|
||||||
|
|
||||||
#ifdef OSHEADER
|
|
||||||
# include OSHEADER
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Handle the VT-switching interface for OSs that use USL-style ioctl()s
|
* Handle the VT-switching interface for OSs that use USL-style ioctl()s
|
||||||
* (the sysv, sco, and linux subdirs).
|
* (the sysv, sco, and linux subdirs).
|
||||||
|
@ -63,16 +59,9 @@ xf86VTSwitchAway(void)
|
||||||
{
|
{
|
||||||
xf86Info.vtRequestsPending = FALSE;
|
xf86Info.vtRequestsPending = FALSE;
|
||||||
if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0)
|
if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0)
|
||||||
{
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
|
||||||
#ifdef OSSWITCHAWAY
|
|
||||||
OSSWITCHAWAY;
|
|
||||||
#endif
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Bool
|
Bool
|
||||||
|
@ -80,13 +69,9 @@ xf86VTSwitchTo(void)
|
||||||
{
|
{
|
||||||
xf86Info.vtRequestsPending = FALSE;
|
xf86Info.vtRequestsPending = FALSE;
|
||||||
if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0)
|
if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0)
|
||||||
{
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Bool
|
Bool
|
||||||
|
|
Loading…
Reference in New Issue
Block a user