[Glibc-bsd-commits] r4238 - in trunk/glibc-ports/kfreebsd: i386/sys x86_64/sys

[Robert Millan]

Author: rmh
Date: 2012-04-27 16:19:00 +0000 (Fri, 27 Apr 2012)
New Revision: 4238

Modified:
   trunk/glibc-ports/kfreebsd/i386/sys/io.h
   trunk/glibc-ports/kfreebsd/x86_64/sys/io.h
Log:
Protect against <machine/cpufunc.h> and <sys/io.h> from being included at the same time (they will fail anyway due to conflicting declarations; giving an error makes it more explicit that it is wrong to do this).

Modified: trunk/glibc-ports/kfreebsd/i386/sys/io.h
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/sys/io.h	2012-04-26 16:15:35 UTC (rev 4237)
+++ trunk/glibc-ports/kfreebsd/i386/sys/io.h	2012-04-27 16:19:00 UTC (rev 4238)
@@ -19,6 +19,10 @@
 #ifndef	_SYS_IO_H
 #define	_SYS_IO_H	1
 
+#ifdef _MACHINE_CPUFUNC_H_
+#error "This header must not be used in combination with <machine/cpufunc.h>."
+#endif
+
 #include <features.h>
 
 __BEGIN_DECLS

Modified: trunk/glibc-ports/kfreebsd/x86_64/sys/io.h
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/sys/io.h	2012-04-26 16:15:35 UTC (rev 4237)
+++ trunk/glibc-ports/kfreebsd/x86_64/sys/io.h	2012-04-27 16:19:00 UTC (rev 4238)
@@ -19,6 +19,10 @@
 #ifndef	_SYS_IO_H
 #define	_SYS_IO_H	1
 
+#ifdef _MACHINE_CPUFUNC_H_
+#error "This header must not be used in combination with <machine/cpufunc.h>."
+#endif
+
 #include <features.h>
 
 __BEGIN_DECLS