From 150b089d08dc0847dd0455c833ac8b7b2340a336 Mon Sep 17 00:00:00 2001
From: marschap <marschap@users.sourceforge.net>
Date: Sun, 26 Aug 2007 21:07:42 +0000
Subject: [PATCH] enable building lcdproc client on FreeBSD AMD64 platform (M.
 Dolze)

---
 ChangeLog                         |  3 ++-
 clients/lcdproc/machine_FreeBSD.c | 20 ++++++++++++++------
 clients/lcdproc/machine_Linux.c   |  5 ++++-
 configure.in                      |  2 +-
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f7901f7..7c0ca44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,7 +20,8 @@ v.0.5dev (ongoing development)
  * MtxOrb driver: fix VFD/VKD support (Ethan Dicks)
  + new driver lis for VLSystem L.I.S VFD (Daryl Fonseca-Holt)
  * serialPOS driver: input support, cleanup (Eric Pooch)
- * new driver shuttleVFD for USB-based Shuttle VFDs (Thien Vu)
+ + new driver shuttleVFD for USB-based Shuttle VFDs (Thien Vu)
+ * enable building lcdproc client on FreeBSD AMD64 platform (M. Dolze)
 
 v.0.5.2
  * fix switching on/off the Load screen in lcdproc client using the menu
diff --git a/clients/lcdproc/machine_FreeBSD.c b/clients/lcdproc/machine_FreeBSD.c
index 03e4a5f..4ca6771 100644
--- a/clients/lcdproc/machine_FreeBSD.c
+++ b/clients/lcdproc/machine_FreeBSD.c
@@ -45,16 +45,22 @@
 #include <sys/mount.h>
 #include <sys/time.h>
 #include <sys/user.h>
-#include <machine/apm_bios.h>
 #include <kvm.h>
 #include <errno.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <net/if_mib.h>
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_MACHINE_APM_BIOS_H
+# include <machine/apm_bios.h>
+#endif
+
 #include "main.h"
 #include "machine.h"
-#include "config.h"
 #include "shared/LL.h"
 
 static int pageshift;
@@ -86,13 +92,14 @@ int machine_close(void)
 
 int machine_get_battstat(int *acstat, int *battflag, int *percent)
 {
-	int apmd;
-	struct apm_info aip;
-
 	*acstat   = LCDP_AC_ON;
 	*battflag = LCDP_BATT_ABSENT;
 	*percent  = 100;
 
+#ifdef HAVE_MACHINE_APM_BIOS_H
+	int apmd;
+	struct apm_info aip;
+
 	if ((apmd = open("/dev/apm", O_RDONLY)) == -1)
 	{
 		perror("get_battstat_open");
@@ -142,6 +149,7 @@ int machine_get_battstat(int *acstat, int *battflag, int *percent)
 		*percent = -1;
 
 	close(apmd);
+#endif
 
 	return(TRUE);
 }
@@ -197,7 +205,7 @@ int machine_get_load(load_type *curr_load)
 	static load_type last_load = { 0, 0, 0, 0, 0 };
 	static load_type last_ret_load;
 	load_type load;
-	u_int32_t cp_time[CPUSTATES];
+	long cp_time[CPUSTATES];
 	size_t size;
 
 	size = sizeof(cp_time);
diff --git a/clients/lcdproc/machine_Linux.c b/clients/lcdproc/machine_Linux.c
index 3fa238b..dce1021 100644
--- a/clients/lcdproc/machine_Linux.c
+++ b/clients/lcdproc/machine_Linux.c
@@ -15,6 +15,10 @@
 #include <sys/statvfs.h>
 #include <errno.h>
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
 # include <time.h>
@@ -47,7 +51,6 @@
 #include "main.h"
 #include "mode.h"
 #include "machine.h"
-#include "config.h"
 #include "shared/LL.h"
 
 
diff --git a/configure.in b/configure.in
index 6806ee1..f392132 100644
--- a/configure.in
+++ b/configure.in
@@ -107,7 +107,7 @@ AC_CHECK_LIB(kvm, kvm_open,[
 ])
 
 dnl NetBSD, OpenBSD and FreeBSD
-AC_CHECK_HEADERS(sched.h sys/sched.h machine/cpufunc.h sys/types.h machine/pio.h machine/sysarch.h sys/cpuvar.h)
+AC_CHECK_HEADERS(sched.h sys/sched.h machine/cpufunc.h sys/types.h machine/pio.h machine/sysarch.h sys/cpuvar.h machine/apm_bios.h)
 ETR_SYSV_IPC
 ETR_UNION_SEMUN