From owner-cvs-src@FreeBSD.ORG Mon Apr 5 04:02:02 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ECB5A16A4CE; Mon, 5 Apr 2004 04:02:02 -0700 (PDT) Received: from bgezal.rise.tuwien.ac.at (bgezal.rise.tuwien.ac.at [128.130.59.74]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1F5543D5C; Mon, 5 Apr 2004 04:02:02 -0700 (PDT) (envelope-from stefan@fafoe.narf.at) Received: from fafoe.narf.at (unknown [212.186.3.235]) by bgezal.rise.tuwien.ac.at (Postfix) with ESMTP id 44BEE209F; Mon, 5 Apr 2004 13:02:01 +0200 (CEST) Received: from wombat.fafoe.narf.at (wombat.fafoe.narf.at [192.168.1.42]) by fafoe.narf.at (Postfix) with ESMTP id 05331410E; Mon, 5 Apr 2004 13:01:58 +0200 (CEST) Received: by wombat.fafoe.narf.at (Postfix, from userid 1001) id E4B29520; Mon, 5 Apr 2004 13:01:56 +0200 (CEST) Date: Mon, 5 Apr 2004 13:01:56 +0200 From: Stefan Farfeleder To: "Bjoern A. Zeeb" Message-ID: <20040405110155.GB608@wombat.fafoe.narf.at> References: <200404050403.i3543949049935@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="oJ71EGRlYNjSvfq7" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.6i cc: cvs-src@FreeBSD.org cc: Nate Lawson cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/contrib/dev/acpica acfreebsd.h X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Apr 2004 11:02:03 -0000 --oJ71EGRlYNjSvfq7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Apr 05, 2004 at 09:55:02AM +0000, Bjoern A. Zeeb wrote: > I am now getting this when doing a make buildworld: > > ===> sys/boot/i386/libi386 > cc -O -pipe -DCOMPORT=0x3f8 -DCOMSPEED=9600 -DTERM_EMU > -I/u2/src/HEAD/compile-20040405-01/sys/boot/i386/libi386/../../common > -I/u2/src/HEAD/compile-20040405-01/sys/boot/i386/libi386/../btx/lib > -I/u2/src/HEAD/compile-20040405-01/sys/boot/i386/libi386/../../../contrib/dev/acpica > -I/u2/src/HEAD/compile-20040405-01/sys/boot/i386/libi386/../../.. -I. > -I/u2/src/HEAD/compile-20040405-01/sys/boot/i386/libi386/../../../../lib/libstand/ > -ffreestanding -mpreferred-stack-boundary=2 -c > /u2/src/HEAD/compile-20040405-01/sys/boot/i386/libi386/biosacpi.c > In file included from /u2/src/HEAD/compile-20040405-01/sys/contrib/dev/acpica/acfreebsd.h:165, > from /u2/src/HEAD/compile-20040405-01/sys/boot/i386/libi386/biosacpi.c:34: > /usr/obj/u2/src/HEAD/compile-20040405-01/i386/usr/include/ctype.h:88: error: syntax error before "int" > *** Error code 1 > > Stop in /u2/src/HEAD/compile-20040405-01/sys/boot/i386/libi386. I apologise, my testing method was obviously flawed :( Here's a quick fix, it doesn't include if we're compiling with -ffreestanding and using . The alternative would be to include before the ACPI headers in all userland applications. Stefan --oJ71EGRlYNjSvfq7 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="acfreebsd.h.diff" Index: src/sys/contrib/dev/acpica/acfreebsd.h =================================================================== RCS file: /usr/home/ncvs/src/sys/contrib/dev/acpica/acfreebsd.h,v retrieving revision 1.24 diff -u -r1.24 acfreebsd.h --- src/sys/contrib/dev/acpica/acfreebsd.h 5 Apr 2004 04:03:09 -0000 1.24 +++ src/sys/contrib/dev/acpica/acfreebsd.h 5 Apr 2004 10:26:55 -0000 @@ -162,7 +162,9 @@ #define ACPI_USE_STANDARD_HEADERS #define ACPI_FLUSH_CPU_CACHE() #include +#if __STDC_HOSTED__ #include +#endif #define __cli() #define __sti() --oJ71EGRlYNjSvfq7--