[Xfce4-commits] <xfce4-battery-plugin:master> Fix #if dance so that <sys/ioctl.h> is also included on OpenBSD

[Landry Breuil]

Updating branch refs/heads/master
         to c7719a2757e1262fa7929a08bde40216c1cc7014 (commit)
       from 4baa0b34bbdca852ed608cfd0d8042985f1e777d (commit)

commit c7719a2757e1262fa7929a08bde40216c1cc7014
Author: Landry Breuil <landry at xfce.org>
Date:   Tue Apr 17 23:19:52 2012 +0200

    Fix #if dance so that <sys/ioctl.h> is also included on OpenBSD

 panel-plugin/battery.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/panel-plugin/battery.c b/panel-plugin/battery.c
index 7b02740..17a0717 100644
--- a/panel-plugin/battery.c
+++ b/panel-plugin/battery.c
@@ -26,11 +26,7 @@
 
 #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && (defined(i386) || defined(__i386__))
 #include <machine/apm_bios.h>
-#elif __OpenBSD__
-#include <sys/param.h>
-#include <machine/apmvar.h>
-#define APMDEVICE "/dev/apm"
-#elif __NetBSD__
+#elif (defined(__OpenBSD__) || defined(__NetBSD__))
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <machine/apmvar.h>