svn commit: r203482 - head/usr.sbin/powerd

[Warner Losh]

Author: imp
Date: Thu Feb  4 07:26:26 2010
New Revision: 203482
URL: http://svn.freebsd.org/changeset/base/203482

Log:
  Since APM is a legacy technology, that won't be adapted to other
  platforms, move the test for i386 from the Makefile to powerd.c.  The
  powerpc specific checks are already done this way...

Modified:
  head/usr.sbin/powerd/Makefile
  head/usr.sbin/powerd/powerd.c

Modified: head/usr.sbin/powerd/Makefile
==============================================================================
--- head/usr.sbin/powerd/Makefile	Thu Feb  4 07:24:13 2010	(r203481)
+++ head/usr.sbin/powerd/Makefile	Thu Feb  4 07:26:26 2010	(r203482)
@@ -6,8 +6,4 @@ MAN=	powerd.8
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS+=-DUSE_APM
-.endif
-
 .include <bsd.prog.mk>

Modified: head/usr.sbin/powerd/powerd.c
==============================================================================
--- head/usr.sbin/powerd/powerd.c	Thu Feb  4 07:24:13 2010	(r203481)
+++ head/usr.sbin/powerd/powerd.c	Thu Feb  4 07:26:26 2010	(r203482)
@@ -46,6 +46,10 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 
+#ifdef __i386__
+#define USE_APM
+#endif
+
 #ifdef USE_APM
 #include <machine/apm_bios.h>
 #endif