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

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-18 15:37:37 +0000 (Sat, 18 Jan 2014)
New Revision: 5344

Added:
   trunk/kfreebsd-kernel-headers/debian/patches/merged.diff
   trunk/kfreebsd-kernel-headers/test/limits.c
Removed:
   trunk/kfreebsd-kernel-headers/debian/patches/bsd_visible.diff
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/series
   trunk/kfreebsd-kernel-headers/test/Makefile
Log:
Expose SIZE_T_MAX, OFF_MAX and OFF_MIN. Add limits.c test to verify.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2014-01-18 15:06:16 UTC (rev 5343)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2014-01-18 15:37:37 UTC (rev 5344)
@@ -1,3 +1,9 @@
+kfreebsd-kernel-headers (10.0~3) UNRELEASED; urgency=low
+
+  * Expose SIZE_T_MAX, OFF_MAX and OFF_MIN. Add limits.c test to verify.
+
+ -- Robert Millan <rmh at debian.org>  Sat, 18 Jan 2014 16:37:25 +0100
+
 kfreebsd-kernel-headers (10.0~2) experimental; urgency=low
 
   * Expose GID_MAX, UID_MAX, UQUAD_MAX, QUAD_MAX and QUAD_MIN.

Deleted: trunk/kfreebsd-kernel-headers/debian/patches/bsd_visible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/bsd_visible.diff	2014-01-18 15:06:16 UTC (rev 5343)
+++ trunk/kfreebsd-kernel-headers/debian/patches/bsd_visible.diff	2014-01-18 15:37:37 UTC (rev 5344)
@@ -1,11 +0,0 @@
---- a/sys/sys/limits.h
-+++ b/sys/sys/limits.h
-@@ -85,7 +85,7 @@
- #define	OFF_MIN		__OFF_MIN	/* min value for an off_t */
- #endif
- 
--#if __BSD_VISIBLE
-+#if 1
- #define	GID_MAX		UINT_MAX	/* max value for a gid_t */
- #define	UID_MAX		UINT_MAX	/* max value for a uid_t */
- 

Copied: trunk/kfreebsd-kernel-headers/debian/patches/merged.diff (from rev 5332, trunk/kfreebsd-kernel-headers/debian/patches/bsd_visible.diff)
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/merged.diff	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/patches/merged.diff	2014-01-18 15:37:37 UTC (rev 5344)
@@ -0,0 +1,19 @@
+--- a/sys/sys/limits.h
++++ b/sys/sys/limits.h
+@@ -78,14 +78,14 @@
+ #endif
+ #endif /* 0 */
+ 
+-#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
++#if 1
+ #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
++#if 1
+ #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	2014-01-18 15:06:16 UTC (rev 5343)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series	2014-01-18 15:37:37 UTC (rev 5344)
@@ -1,7 +1,7 @@
 # Patches merged in kfreebsd-11 package (userland.diff)
+merged.diff
 
 # Patches that are in good shape for merging upstream
-bsd_visible.diff
 queue_collision.diff
 type_collision.diff
 

Modified: trunk/kfreebsd-kernel-headers/test/Makefile
===================================================================
--- trunk/kfreebsd-kernel-headers/test/Makefile	2014-01-18 15:06:16 UTC (rev 5343)
+++ trunk/kfreebsd-kernel-headers/test/Makefile	2014-01-18 15:37:37 UTC (rev 5344)
@@ -19,6 +19,7 @@
 	devicestat.o \
 	in_pcb.o \
 	ino_t.o \
+	limits.o \
 	ppp.o \
 	sctp.o \
 	soundcard.o \

Added: trunk/kfreebsd-kernel-headers/test/limits.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/limits.c	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/test/limits.c	2014-01-18 15:37:37 UTC (rev 5344)
@@ -0,0 +1,6 @@
+#include <sys/limits.h>
+#include "assert.h"
+
+COMPILE_TIME_ASSERT(valid_OFF_MAX, OFF_MAX > 0);
+COMPILE_TIME_ASSERT(valid_OFF_MIN, OFF_MIN < 0);
+COMPILE_TIME_ASSERT(valid_UQUAD_MAX, UQUAD_MAX > 0);