From owner-svn-src-head@FreeBSD.ORG  Thu Feb  4 07:26:26 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BE9F31065676;
	Thu,  4 Feb 2010 07:26:26 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AF4108FC23;
	Thu,  4 Feb 2010 07:26:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o147QQWV047297;
	Thu, 4 Feb 2010 07:26:26 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o147QQ4R047294;
	Thu, 4 Feb 2010 07:26:26 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201002040726.o147QQ4R047294@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 4 Feb 2010 07:26:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r203482 - head/usr.sbin/powerd
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2010 07:26:26 -0000

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