From owner-svn-src-all@FreeBSD.ORG  Fri Aug 13 00:45:30 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 763BC1065693;
	Fri, 13 Aug 2010 00:45:30 +0000 (UTC)
	(envelope-from takawata@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 655E38FC0A;
	Fri, 13 Aug 2010 00:45:30 +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 o7D0jUrd043603;
	Fri, 13 Aug 2010 00:45:30 GMT
	(envelope-from takawata@svn.freebsd.org)
Received: (from takawata@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7D0jUW6043601;
	Fri, 13 Aug 2010 00:45:30 GMT
	(envelope-from takawata@svn.freebsd.org)
Message-Id: <201008130045.o7D0jUW6043601@svn.freebsd.org>
From: Takanori Watanabe <takawata@FreeBSD.org>
Date: Fri, 13 Aug 2010 00:45:30 +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: r211252 - head/usr.sbin/acpi/acpidump
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Aug 2010 00:45:30 -0000

Author: takawata
Date: Fri Aug 13 00:45:30 2010
New Revision: 211252
URL: http://svn.freebsd.org/changeset/base/211252

Log:
  Fix build on amd64 and ia64.

Modified:
  head/usr.sbin/acpi/acpidump/acpi.c

Modified: head/usr.sbin/acpi/acpidump/acpi.c
==============================================================================
--- head/usr.sbin/acpi/acpidump/acpi.c	Fri Aug 13 00:21:32 2010	(r211251)
+++ head/usr.sbin/acpi/acpidump/acpi.c	Fri Aug 13 00:45:30 2010	(r211252)
@@ -40,7 +40,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <inttypes.h>
 
 #include "acpidump.h"
 
@@ -623,7 +622,7 @@ acpi_handle_tcpa(ACPI_TABLE_HEADER *sdp)
 {
 	struct TCPAbody *tcpa;
 	struct TCPAevent *event;
-	u_int64_t len, paddr;
+	uint64_t len, paddr;
 	unsigned char *vaddr = NULL;
 	unsigned char *vend = NULL;
 
@@ -647,7 +646,7 @@ acpi_handle_tcpa(ACPI_TABLE_HEADER *sdp)
 		printf(END_COMMENT);
 		return;
 	}
-	printf("\tClass %d Base Address 0x%jx Length %" PRIu64 "\n\n",
+	printf("\tClass %u Base Address 0x%jx Length %ju\n\n",
 	    tcpa->platform_class, paddr, len);
 
 	if (len == 0) {
@@ -662,7 +661,7 @@ acpi_handle_tcpa(ACPI_TABLE_HEADER *sdp)
 	while (vaddr != NULL) {
 		if (vaddr + sizeof(struct TCPAevent) >= vend)
 			break;
-		event = (struct TCPAevent *)vaddr;
+		event = (struct TCPAevent *)(void *)vaddr;
 		if (vaddr + event->event_size >= vend)
 			break;
 		if (event->event_type == 0 && event->event_size == 0)