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

[Robert Millan]

Author: rmh
Date: 2012-05-21 14:37:36 +0000 (Mon, 21 May 2012)
New Revision: 4268

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/bsd_visible.diff
   trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
Log:
Unexpose a few more macros which collide with glibc: CLOCK_THREAD_CPUTIME_ID, TIMER_RELTIME and TIMER_ABSTIME.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2012-05-19 13:45:03 UTC (rev 4267)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2012-05-21 14:37:36 UTC (rev 4268)
@@ -5,6 +5,8 @@
   * Enable "struct bintime" unconditionally, as it is needed by other
     kernel headers.
   * Add test for <sys/devicestat.h> buildability.
+  * Unexpose a few more macros which collide with glibc:
+    CLOCK_THREAD_CPUTIME_ID, TIMER_RELTIME and TIMER_ABSTIME.
 
  -- Robert Millan <rmh at debian.org>  Sat, 19 May 2012 14:19:56 +0200
 

Modified: trunk/kfreebsd-kernel-headers/debian/patches/bsd_visible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/bsd_visible.diff	2012-05-19 13:45:03 UTC (rev 4267)
+++ trunk/kfreebsd-kernel-headers/debian/patches/bsd_visible.diff	2012-05-21 14:37:36 UTC (rev 4268)
@@ -1,6 +1,6 @@
 --- a/sys/sys/time.h
 +++ b/sys/sys/time.h
-@@ -46,7 +46,7 @@
+@@ -52,7 +52,7 @@
  #define	DST_EET		5	/* Eastern European dst */
  #define	DST_CAN		6	/* Canada */
  

Modified: trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff	2012-05-19 13:45:03 UTC (rev 4267)
+++ trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff	2012-05-21 14:37:36 UTC (rev 4268)
@@ -202,20 +202,22 @@
  #endif /* !_SYS_TYPES_H_ */
 --- a/sys/sys/time.h
 +++ b/sys/sys/time.h
-@@ -36,11 +36,8 @@
+@@ -36,11 +36,14 @@
  #include <sys/_timeval.h>
  #include <sys/kern/types.h>
  #include <sys/timespec.h>
 +#include <sys/time.h>
  
--struct timezone {
--	int	tz_minuteswest;	/* minutes west of Greenwich */
--	int	tz_dsttime;	/* type of dst correction */
--};
++#if 0
+ struct timezone {
+ 	int	tz_minuteswest;	/* minutes west of Greenwich */
+ 	int	tz_dsttime;	/* type of dst correction */
+ };
++#endif
  #define	DST_NONE	0	/* not on dst */
  #define	DST_USA		1	/* USA style dst */
  #define	DST_AUST	2	/* Australian style dst */
-@@ -199,7 +196,7 @@
+@@ -199,7 +202,7 @@
  
  #endif /* _KERNEL */
  
@@ -224,7 +226,7 @@
  
  #define	timerclear(tvp)		((tvp)->tv_sec = (tvp)->tv_usec = 0)
  #define	timerisset(tvp)		((tvp)->tv_sec || (tvp)->tv_usec)
-@@ -227,6 +224,7 @@
+@@ -227,6 +230,7 @@
  	} while (0)
  #endif
  
@@ -232,15 +234,16 @@
  /*
   * Names of the interval timers, and structure
   * defining a timer setting.
-@@ -250,6 +248,7 @@
- 	int	stathz;		/* statistics clock frequency */
- 	int	profhz;		/* profiling clock frequency */
- };
+@@ -273,6 +277,8 @@
+ #define TIMER_ABSTIME	0x1	/* absolute timer */
+ #endif
+ 
 +#endif
++
+ #ifdef _KERNEL
  
- /* These macros are also in time.h. */
- #ifndef CLOCK_REALTIME
-@@ -338,6 +337,7 @@
+ /*
+@@ -338,6 +344,7 @@
  #include <sys/cdefs.h>
  #include <sys/select.h>
  
@@ -248,7 +251,7 @@
  __BEGIN_DECLS
  int	setitimer(int, const struct itimerval *, struct itimerval *);
  int	utimes(const char *, const struct timeval *);
-@@ -356,6 +356,7 @@
+@@ -356,6 +363,7 @@
  #endif
  
  __END_DECLS