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

[Robert Millan]

Author: rmh
Date: 2013-09-28 22:46:23 +0000 (Sat, 28 Sep 2013)
New Revision: 4976

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/test/type_collision.c
Log:
test/type_collision.c: Include all types from glibc that may potentially conflict with <sys/kern/types.h>.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2013-09-28 15:27:18 UTC (rev 4975)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2013-09-28 22:46:23 UTC (rev 4976)
@@ -13,6 +13,8 @@
   * Install trimmed version of <sys/socket.h> and check for collisions
     in testsuite.
   * Fix sig_atomic_t collision and add sig_atomic_collision.c test.
+  * test/type_collision.c: Include all types from glibc that may
+    potentially conflict with <sys/kern/types.h>.
 
  -- Robert Millan <rmh at debian.org>  Sat, 21 Sep 2013 17:07:34 +0200
 

Modified: trunk/kfreebsd-kernel-headers/test/type_collision.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/type_collision.c	2013-09-28 15:27:18 UTC (rev 4975)
+++ trunk/kfreebsd-kernel-headers/test/type_collision.c	2013-09-28 22:46:23 UTC (rev 4976)
@@ -1,2 +1,14 @@
 #include <sys/types.h>
+
+#define __need_clock_t
+#define __need_time_t
+#define __need_timer_t
+#include <time.h>
+
+/* mqd_t */
+#include <mqueue.h>
+
+#define __need_mbstate_t
+#include <wchar.h>
+
 #include <sys/kern/types.h>