From 33290fb670496e3abad39f3d11f68ebeda3ab819 Mon Sep 17 00:00:00 2001 From: oga Date: Tue, 30 Mar 2010 17:43:19 +0000 Subject: [PATCH] #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@ --- xserver/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c | 2 ++ 1 file changed, 2 insertions(+) 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; }