[Glibc-bsd-commits] r4230 - in trunk/kfreebsd-kernel-headers/debian: . patches

[Robert Millan]

Author: rmh
Date: 2012-04-22 08:34:14 +0000 (Sun, 22 Apr 2012)
New Revision: 4230

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
Remove out[bwl] regex rule. Instead, error out in <machine/cpufunc.h> when <sys/io.h> has been included.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2012-04-21 23:01:34 UTC (rev 4229)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2012-04-22 08:34:14 UTC (rev 4230)
@@ -12,8 +12,10 @@
   * Fix visibility issues with <sys/limits.h>.
   * Install <sys/elf.h> and add a test to check for conflicts with
     <elf.h>.
+  * Remove out[bwl] regex rule. Instead, error out in
+    <machine/cpufunc.h> when <sys/io.h> has been included.
 
- -- Robert Millan <rmh at debian.org>  Sun, 22 Apr 2012 01:01:25 +0200
+ -- Robert Millan <rmh at debian.org>  Sun, 22 Apr 2012 10:34:06 +0200
 
 kfreebsd-kernel-headers (0.79) unstable; urgency=low
 

Modified: trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff	2012-04-21 23:01:34 UTC (rev 4229)
+++ trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff	2012-04-22 08:34:14 UTC (rev 4230)
@@ -3,8 +3,14 @@
 
 --- a/sys/amd64/include/cpufunc.h
 +++ b/sys/amd64/include/cpufunc.h
-@@ -41,6 +41,9 @@
+@@ -39,8 +39,15 @@
+ #ifndef _MACHINE_CPUFUNC_H_
+ #define	_MACHINE_CPUFUNC_H_
  
++#ifdef _SYS_IO_H
++#error "This header must not be used in combination with <sys/io.h>."
++#endif
++
  #include <sys/types.h>
  
 +#include <stdint.h>
@@ -46,8 +52,14 @@
  
 --- a/sys/i386/include/cpufunc.h
 +++ b/sys/i386/include/cpufunc.h
-@@ -40,6 +40,9 @@
+@@ -38,8 +38,15 @@
+ #ifndef _MACHINE_CPUFUNC_H_
+ #define	_MACHINE_CPUFUNC_H_
  
++#ifdef _SYS_IO_H
++#error "This header must not be used in combination with <sys/io.h>."
++#endif
++
  #include <sys/types.h>
  
 +#include <stdint.h>

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2012-04-21 23:01:34 UTC (rev 4229)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2012-04-22 08:34:14 UTC (rev 4230)
@@ -65,8 +65,6 @@
 		-e 's/\(\s\|^\|(\)u_\(char\|int\|short\|long\)\(\s\)/\1unsigned \2\3/g' \
 		-e 's/__printflike(\([0-9]\+\),\s*\([0-9]\+\))/__attribute__((__format__ (__printf__, \1, \2)))/g' \
 		\
-		-e 's/\(\s\|^\|(\)\(out[bwl]\)\(\s*(\)/\1__bsd_\2\3/g' \
-		\
 		-e 's/defined\s*(\s*_SYS_CDEFS_H_\s*)/defined(_SYS_CDEFS_H)/g' \
 		-e 's/#\s*ifdef\s*_SYS_CDEFS_H_\(\s\|$$\)/#ifdef _SYS_CDEFS_H/g' \
 		-e 's/#\s*ifndef\s*_SYS_CDEFS_H_\(\s\|$$\)/#ifndef _SYS_CDEFS_H/g' \