[Glibc-bsd-commits] r4271 - in trunk/kfreebsd-kernel-headers/debian: . patches

[Robert Millan]

Author: rmh
Date: 2012-05-21 15:44:54 +0000 (Mon, 21 May 2012)
New Revision: 4271

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
Log:
Fix unintentional removal of implicit <sys/select.h> include.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2012-05-21 15:20:39 UTC (rev 4270)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2012-05-21 15:44:54 UTC (rev 4271)
@@ -10,6 +10,7 @@
   * Fix NZERO collision.
   * Fix stdarg.h collisions and add a new test (stdarg.c) to detect
     them.
+  * Fix unintentional removal of implicit <sys/select.h> include.
 
  -- Robert Millan <rmh at debian.org>  Sat, 19 May 2012 14:19:56 +0200
 

Modified: trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff	2012-05-21 15:20:39 UTC (rev 4270)
+++ trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff	2012-05-21 15:44:54 UTC (rev 4271)
@@ -183,23 +183,18 @@
  #ifndef _RLIM_T_DECLARED
  typedef	__rlim_t	rlim_t;		/* resource limit */
  #define	_RLIM_T_DECLARED
-@@ -273,6 +279,7 @@
- 
+@@ -269,10 +275,8 @@
+  * The following are all things that really shouldn't exist in this header,
+  * since its purpose is to provide typedefs, not miscellaneous doodads.
+  */
+-#if __BSD_VISIBLE
+-
  #include <sys/select.h>
- 
+-
 +#if 0
  /*
   * minor() gives a cookie instead of an index since we don't want to
   * change the meanings of bits 0-15 or waste time and space shifting
-@@ -308,6 +315,8 @@
- __END_DECLS
- #endif /* !_KERNEL */
- 
-+#endif
-+
- #endif /* __BSD_VISIBLE */
- 
- #endif /* !_SYS_TYPES_H_ */
 --- a/sys/sys/time.h
 +++ b/sys/sys/time.h
 @@ -36,11 +36,14 @@