cvs commit: src/sys/contrib/dev/acpica acfreebsd.h

[Stefan Farfeleder]

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 <ctype.h> if we're compiling with -ffreestanding
and using <stand.h>.  The alternative would be to include <ctype.h>
before the ACPI headers in all userland applications.

Stefan
-------------- next part --------------
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 <sys/types.h>
+#if __STDC_HOSTED__
 #include <ctype.h>
+#endif
 
 #define __cli()
 #define __sti()