[Glibc-bsd-commits] r4221 - trunk/kfreebsd-kernel-headers/debian/patches

[Robert Millan]

Author: rmh
Date: 2012-04-21 13:46:07 +0000 (Sat, 21 Apr 2012)
New Revision: 4221

Modified:
   trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
Log:
Remove function declarations from <sys/time.h>.

Modified: trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff	2012-04-21 13:45:40 UTC (rev 4220)
+++ trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff	2012-04-21 13:46:07 UTC (rev 4221)
@@ -245,6 +245,22 @@
  
  /* These macros are also in time.h. */
  #ifndef CLOCK_REALTIME
+@@ -338,6 +321,7 @@
+ #include <sys/cdefs.h>
+ #include <sys/select.h>
+ 
++#if 0
+ __BEGIN_DECLS
+ int	setitimer(int, const struct itimerval *, struct itimerval *);
+ int	utimes(const char *, const struct timeval *);
+@@ -356,6 +340,7 @@
+ #endif
+ 
+ __END_DECLS
++#endif
+ 
+ #endif /* !_KERNEL */
+ 
 --- a/sys/sys/timespec.h
 +++ b/sys/sys/timespec.h
 @@ -51,6 +51,7 @@