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

[Robert Millan]

Author: rmh
Date: 2013-09-28 15:18:37 +0000 (Sat, 28 Sep 2013)
New Revision: 4973

Added:
   trunk/kfreebsd-kernel-headers/test/signal_collision.c
   trunk/kfreebsd-kernel-headers/test/socket_collision.c
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/install
   trunk/kfreebsd-kernel-headers/debian/patches/series
   trunk/kfreebsd-kernel-headers/test/Makefile
Log:
Install trimmed version of <sys/socket.h> and check for collisions in testsuite.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2013-09-28 15:17:12 UTC (rev 4972)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2013-09-28 15:18:37 UTC (rev 4973)
@@ -10,6 +10,8 @@
   * endian_collision.diff: Fix collisions in endian.h. Verify using
     asserts (test/endian_collision.c).
   * Filter out __used in debian/rules.
+  * Install trimmed version of <sys/socket.h> and check for collisions
+    in testsuite.
 
  -- Robert Millan <rmh at debian.org>  Sat, 21 Sep 2013 17:07:34 +0200
 

Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install	2013-09-28 15:17:12 UTC (rev 4972)
+++ trunk/kfreebsd-kernel-headers/debian/install	2013-09-28 15:18:37 UTC (rev 4973)
@@ -179,6 +179,7 @@
 sys/sys/_null.h                         usr/include/sys
 sys/sys/_rwlock.h                       usr/include/sys
 sys/sys/_semaphore.h                    usr/include/sys
+sys/sys/_sigset.h			usr/include/sys
 sys/sys/_sx.h                           usr/include/sys
 sys/sys/_stdint.h			usr/include/sys
 sys/sys/_task.h                         usr/include/sys
@@ -292,6 +293,7 @@
 sys/sys/sigio.h                         usr/include/sys
 sys/sys/signalvar.h                     usr/include/sys
 sys/sys/snoop.h                         usr/include/sys
+sys/sys/socket.h			usr/include/sys/kglue/sys
 sys/sys/sockio.h                        usr/include/sys
 sys/sys/soundcard.h                     usr/include/sys
 sys/sys/sx.h                            usr/include/sys

Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series	2013-09-28 15:17:12 UTC (rev 4972)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series	2013-09-28 15:18:37 UTC (rev 4973)
@@ -36,3 +36,5 @@
 050_sigframe.diff
 remove_link_addr_and_link_ntoa.diff
 queue_collision.diff
+sys_socket.diff
+signal_collision.diff

Modified: trunk/kfreebsd-kernel-headers/test/Makefile
===================================================================
--- trunk/kfreebsd-kernel-headers/test/Makefile	2013-09-28 15:17:12 UTC (rev 4972)
+++ trunk/kfreebsd-kernel-headers/test/Makefile	2013-09-28 15:18:37 UTC (rev 4973)
@@ -1,6 +1,8 @@
 TESTS = \
 	assert_correct_bsize.o \
 	endian_collision.o \
+	socket_collision.o \
+	signal_collision.o \
 	termios_collision.o \
 	type_collision.o \
 	time_collision.o \

Added: trunk/kfreebsd-kernel-headers/test/signal_collision.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/signal_collision.c	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/test/signal_collision.c	2013-09-28 15:18:37 UTC (rev 4973)
@@ -0,0 +1,4 @@
+#include <sys/cdefs.h>
+#include <sys/_types.h>
+#include <machine/_limits.h>
+#include <machine/signal.h>

Added: trunk/kfreebsd-kernel-headers/test/socket_collision.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/socket_collision.c	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/test/socket_collision.c	2013-09-28 15:18:37 UTC (rev 4973)
@@ -0,0 +1,2 @@
+#include <sys/uio.h>
+#include <sys/kglue/sys/socket.h>