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

[Robert Millan]

Author: rmh
Date: 2012-04-21 22:42:10 +0000 (Sat, 21 Apr 2012)
New Revision: 4228

Added:
   trunk/kfreebsd-kernel-headers/debian/patches/bsd_visible.diff
   trunk/kfreebsd-kernel-headers/test/limits_collision.c
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/series
   trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
   trunk/kfreebsd-kernel-headers/test/Makefile
Log:
Fix visibility issues with <sys/limits.h>.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2012-04-21 21:20:59 UTC (rev 4227)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2012-04-21 22:42:10 UTC (rev 4228)
@@ -9,8 +9,9 @@
   * Likewise for <sys/time.h>, <sys/param.h> and <sys/queue.h>.
   * Add -D_GNU_SOURCE to testsuite to probe for collisions more
     aggresively.
+  * Fix visibility issues with <sys/limits.h>.
 
- -- Robert Millan <rmh at debian.org>  Sat, 21 Apr 2012 15:45:27 +0200
+ -- Robert Millan <rmh at debian.org>  Sun, 22 Apr 2012 00:41:58 +0200
 
 kfreebsd-kernel-headers (0.79) unstable; urgency=low
 

Added: trunk/kfreebsd-kernel-headers/debian/patches/bsd_visible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/bsd_visible.diff	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/patches/bsd_visible.diff	2012-04-21 22:42:10 UTC (rev 4228)
@@ -0,0 +1,42 @@
+--- a/sys/sys/time.h
++++ b/sys/sys/time.h
+@@ -46,7 +46,7 @@
+ #define	DST_EET		5	/* Eastern European dst */
+ #define	DST_CAN		6	/* Canada */
+ 
+-#if __BSD_VISIBLE
++#ifdef __USE_BSD
+ struct bintime {
+ 	time_t	sec;
+ 	uint64_t frac;
+--- a/sys/sys/limits.h
++++ b/sys/sys/limits.h
+@@ -34,7 +34,9 @@
+ 
+ #include <sys/cdefs.h>
+ #include <machine/_limits.h>
++#include <limits.h>
+ 
++#if 0
+ #define	CHAR_BIT	__CHAR_BIT	/* number of bits in a char */
+ 
+ #define	SCHAR_MAX	__SCHAR_MAX	/* max value for a signed char */
+@@ -71,15 +73,16 @@
+ #if __POSIX_VISIBLE || __XSI_VISIBLE
+ #define	SSIZE_MAX	__SSIZE_MAX	/* max value for an ssize_t */
+ #endif
++#endif /* 0 */
+ 
+-#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
++#if _POSIX_C_SOURCE >= 200112
+ #define	SIZE_T_MAX	__SIZE_T_MAX	/* max value for a size_t */
+ 
+ #define	OFF_MAX		__OFF_MAX	/* max value for an off_t */
+ #define	OFF_MIN		__OFF_MIN	/* min value for an off_t */
+ #endif
+ 
+-#if __BSD_VISIBLE
++#ifdef __USE_BSD
+ #define	GID_MAX		UINT_MAX	/* max value for a gid_t */
+ #define	UID_MAX		UINT_MAX	/* max value for a uid_t */
+ 

Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series	2012-04-21 21:20:59 UTC (rev 4227)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series	2012-04-21 22:42:10 UTC (rev 4228)
@@ -34,3 +34,4 @@
 endian_collision.diff
 type_collision.diff
 param_collision.diff
+bsd_visible.diff

Modified: trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff	2012-04-21 21:20:59 UTC (rev 4227)
+++ trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff	2012-04-21 22:42:10 UTC (rev 4228)
@@ -220,15 +220,6 @@
  #define	DST_NONE	0	/* not on dst */
  #define	DST_USA		1	/* USA style dst */
  #define	DST_AUST	2	/* Australian style dst */
-@@ -49,7 +46,7 @@
- #define	DST_EET		5	/* Eastern European dst */
- #define	DST_CAN		6	/* Canada */
- 
--#if __BSD_VISIBLE
-+#if 1
- struct bintime {
- 	time_t	sec;
- 	uint64_t frac;
 @@ -199,7 +196,7 @@
  
  #endif /* _KERNEL */

Modified: trunk/kfreebsd-kernel-headers/test/Makefile
===================================================================
--- trunk/kfreebsd-kernel-headers/test/Makefile	2012-04-21 21:20:59 UTC (rev 4227)
+++ trunk/kfreebsd-kernel-headers/test/Makefile	2012-04-21 22:42:10 UTC (rev 4228)
@@ -2,6 +2,7 @@
 	type_collision.o \
 	time_collision.o \
 	param_collision.o \
+	limits_collision.o \
 	uintXX_t.o \
 	\
 	bus.o \

Added: trunk/kfreebsd-kernel-headers/test/limits_collision.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/limits_collision.c	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/test/limits_collision.c	2012-04-21 22:42:10 UTC (rev 4228)
@@ -0,0 +1,2 @@
+#include <limits.h>
+#include <sys/limits.h>