[Glibc-bsd-commits] r4239 - trunk/kfreebsd-kernel-headers/debian

[Robert Millan]

Author: rmh
Date: 2012-04-27 20:58:16 +0000 (Fri, 27 Apr 2012)
New Revision: 4239

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
Apply s/_SYS_QUEUE_H_/_FREEBSD_SYS_QUEUE_H_/g sed rule to avoid collision with GNU <sys/queue.h> header protection.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2012-04-27 16:19:00 UTC (rev 4238)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2012-04-27 20:58:16 UTC (rev 4239)
@@ -1,3 +1,10 @@
+kfreebsd-kernel-headers (9.0-2) UNRELEASED; urgency=low
+
+  * Apply s/_SYS_QUEUE_H_/_FREEBSD_SYS_QUEUE_H_/g sed rule to avoid
+    collision with GNU <sys/queue.h> header protection.
+
+ -- Robert Millan <rmh at debian.org>  Fri, 27 Apr 2012 22:58:02 +0200
+
 kfreebsd-kernel-headers (9.0-1) experimental; urgency=low
 
   * Install kernel version of <sys/types.h> in an alternate location and

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2012-04-27 16:19:00 UTC (rev 4238)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2012-04-27 20:58:16 UTC (rev 4239)
@@ -69,6 +69,8 @@
 		-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' \
 		\
+		-e 's/_SYS_QUEUE_H_/_FREEBSD_SYS_QUEUE_H_/g' \
+		\
 		-e 's/#\s*include\s\+<sys\/types\.h>\s*/#include <sys\/kern\/types.h>/g' \
 		-e 's/#\s*include\s\+<sys\/time\.h>\s*/#include <sys\/kern\/time.h>/g' \
 		-e 's/#\s*include\s\+<sys\/param\.h>\s*/#include <sys\/kern\/param.h>/g' \