Commit Diff

Commit:
6f6012e1e9723792395c6f8a96a3fa261ef91c56
From:
wkj <devnull@localhost>
Date:
Message:
Fix the build on FreeBSD 6.x. The resulting binary still seems to produce suspect statistics.
Actions:
Patch | Tree
commit - 7444e9d14f1443aef9230e891661327e0c468197
commit + 6f6012e1e9723792395c6f8a96a3fa261ef91c56
blob - 2d0fd57ede4a4a275dfe42a84f429c3a53777242
blob + 737fe390079eba95e371578a2775f765ad113665
--- src/cmd/auxstats/FreeBSD.c
+++ src/cmd/auxstats/FreeBSD.c
@@ -11,7 +11,9 @@
 #include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
+#if __FreeBSD_version < 600000
 #include <machine/apm_bios.h>
+#endif
 #include <sys/ioctl.h>
 #include <limits.h>
 #include <libc.h>
@@ -137,7 +139,8 @@ int
 xacpi(int first)
 {
 	int rv;
-	int val, len;
+	int val;
+	long len;
 
 	len = sizeof(val);
 	rv = sysctlbyname("hw.acpi.battery.life", &val, &len, nil, 0);
@@ -154,6 +157,7 @@ xacpi(int first)
 }
 #endif
 
+#if __FreeBSD_version < 600000
 void
 xapm(int first)
 {
@@ -175,6 +179,13 @@ xapm(int first)
 	if(ai.ai_batt_life <= 100)
 		Bprint(&bout, "battery =%d 100\n", ai.ai_batt_life);
 }
+#else
+void
+xapm(int first)
+{
+	return;
+}
+#endif
 
 int
 rsys(char *name, char *buf, int len)