[Glibc-bsd-commits] r4893 - in trunk/kfreebsd-kernel-headers: debian test

[Robert Millan]

Author: rmh
Date: 2013-08-19 14:33:54 +0000 (Mon, 19 Aug 2013)
New Revision: 4893

Added:
   trunk/kfreebsd-kernel-headers/test/queue_collision.c
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/rules
   trunk/kfreebsd-kernel-headers/test/Makefile
Log:
Revert s/_SYS_QUEUE_H_/_FREEBSD_SYS_QUEUE_H_/ sed rule. We actually want header protection to match with GNU <sys/queue.h> as to prevent the rest of the macros from colliding. Add a test for <sys/queue.h> collisions.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2013-08-18 23:18:36 UTC (rev 4892)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2013-08-19 14:33:54 UTC (rev 4893)
@@ -8,6 +8,10 @@
     <sys/pipe.h> and <sys/taskqueue.h>.
   * Prevent Glibc ino_t from messing with kernel definition of ino_t
     (from now on known as '__kernel_ino_t').
+  * Revert s/_SYS_QUEUE_H_/_FREEBSD_SYS_QUEUE_H_/ sed rule. We actually
+    want header protection to match with GNU <sys/queue.h> as to prevent
+    the rest of the macros from colliding. Add a test for <sys/queue.h>
+    collisions.
 
  -- Robert Millan <rmh at debian.org>  Sun, 04 Aug 2013 18:07:05 +0200
 

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2013-08-18 23:18:36 UTC (rev 4892)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2013-08-19 14:33:54 UTC (rev 4893)
@@ -72,8 +72,6 @@
 		-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' \

Modified: trunk/kfreebsd-kernel-headers/test/Makefile
===================================================================
--- trunk/kfreebsd-kernel-headers/test/Makefile	2013-08-18 23:18:36 UTC (rev 4892)
+++ trunk/kfreebsd-kernel-headers/test/Makefile	2013-08-19 14:33:54 UTC (rev 4893)
@@ -4,6 +4,7 @@
 	type_collision.o \
 	time_collision.o \
 	param_collision.o \
+	queue_collision.o \
 	limits_collision.o \
 	uintXX_t.o \
 	\

Added: trunk/kfreebsd-kernel-headers/test/queue_collision.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/queue_collision.c	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/test/queue_collision.c	2013-08-19 14:33:54 UTC (rev 4893)
@@ -0,0 +1,2 @@
+#include <sys/queue.h>
+#include <sys/kern/queue.h>