diff options
author | Owain Ainsworth <oga@cvs.openbsd.org> | 2010-03-30 17:43:20 +0000 |
---|---|---|
committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2010-03-30 17:43:20 +0000 |
commit | 4d6ac936345b34f44235d7724cf472c881b67d1c (patch) | |
tree | c508f848832603d0b036f33be06dcca47991abd8 | |
parent | 37fb804b6cfd133df37e31697871e5a56ac54079 (diff) |
#if 0 out the code that listens for /dev/apm events.
A cleaner fix will be forthcoming, but for now this allows the xserver
to work nicely with the recent kernel vt-switch-on-suspend changes.
ok miod@
-rw-r--r-- | xserver/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xserver/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c b/xserver/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c index b37070c37..d86496f85 100644 --- a/xserver/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c +++ b/xserver/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c @@ -156,6 +156,7 @@ bsdPMConfirmEventToOs(int dummyfd, pmEvent event) PMClose xf86OSPMOpen(void) { +#ifndef __OpenBSD__ int kq; struct kevent ev; @@ -179,6 +180,7 @@ xf86OSPMOpen(void) xf86PMGetEventFromOs = bsdPMGetEventFromOS; xf86PMConfirmEventToOs = bsdPMConfirmEventToOs; APMihPtr = xf86AddInputHandler(kq, xf86HandlePMEvents, NULL); +#endif /* __OpenBSD__ */ return bsdCloseAPM; } |