Bug#743068: xbattbar: FTBFS[kfreebsd-*]: wrong ifdefs

[Steven Chamberlain <steven@pyro.eu.org>]

Package: xbattbar
Version: 1.4.4-1
Severity: serious
Tags: patch
User: debian-bsd@lists.debian.org
Usertags: kfreebsd

Hi,

xbattbar FTBFS on kfreebsd, but the attached simple change fixes this.

Thanks.

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: kfreebsd-amd64 (x86_64)

Kernel: kFreeBSD 9.0-2-amd64-xenhvm
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Index: xbattbar-1.4.4/xbattbar-check-apm.c
===================================================================
--- xbattbar-1.4.4.orig/xbattbar-check-apm.c	2013-10-17 08:01:42.000000000 +0100
+++ xbattbar-1.4.4/xbattbar-check-apm.c	2014-03-30 18:14:25.117372374 +0100
@@ -74,8 +74,9 @@
 
 #endif /* __bsdi__ */
 
-#ifdef __FreeBSD__
+#if defined __FreeBSD__ || defined __FreeBSD_kernel__
 
+#include <sys/fcntl.h>
 #include <machine/apm_bios.h>
 
 #define APMDEV21       "/dev/apm0"
@@ -197,7 +198,7 @@
 #endif /* __NetBSD__ */
 
 
-#ifdef linux
+#ifdef __linux__
 
 #include <errno.h>
 #include <linux/apm_bios.h>