[Glibc-bsd-commits] r4216 - in trunk/kfreebsd-kernel-headers: debian debian/patches test
Robert Millan
rmh at alioth.debian.org
Sat Apr 21 13:10:38 UTC 2012
Author: rmh
Date: 2012-04-21 13:10:37 +0000 (Sat, 21 Apr 2012)
New Revision: 4216
Added:
trunk/kfreebsd-kernel-headers/test/time_collision.c
Removed:
trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff
Modified:
trunk/kfreebsd-kernel-headers/debian/changelog
trunk/kfreebsd-kernel-headers/debian/install
trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff
trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
trunk/kfreebsd-kernel-headers/debian/patches/series
trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
trunk/kfreebsd-kernel-headers/debian/rules
trunk/kfreebsd-kernel-headers/test/Makefile
Log:
Likewise for <sys/time.h>.
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2012-04-21 12:46:33 UTC (rev 4215)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2012-04-21 13:10:37 UTC (rev 4216)
@@ -6,8 +6,9 @@
- type_collision.c: Verify there is no collision with the GNU version
of <sys/types.h>.
- uintXX_t.c: Check for uintXX_t type availability (for kernel users).
+ * Likewise for <sys/time.h>.
- -- Robert Millan <rmh at debian.org> Fri, 20 Apr 2012 22:44:35 +0200
+ -- Robert Millan <rmh at debian.org> Sat, 21 Apr 2012 15:10:17 +0200
kfreebsd-kernel-headers (0.79) unstable; urgency=low
Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install 2012-04-21 12:46:33 UTC (rev 4215)
+++ trunk/kfreebsd-kernel-headers/debian/install 2012-04-21 13:10:37 UTC (rev 4216)
@@ -306,7 +306,7 @@
sys/sys/tty.h usr/include/sys
sys/sys/ttycom.h usr/include/sys
sys/sys/ttyqueue.h usr/include/sys
-# Avoid conflict with <sys/types.h> in glibc
+sys/sys/time.h usr/include/sys/kern
sys/sys/types.h usr/include/sys/kern
sys/sys/ucred.h usr/include/sys
sys/sys/unpcb.h usr/include/sys
Modified: trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff 2012-04-21 12:46:33 UTC (rev 4215)
+++ trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff 2012-04-21 13:10:37 UTC (rev 4216)
@@ -129,7 +129,7 @@
@@ -33,6 +33,7 @@
#include <sys/queue.h>
- #include <sys/time.h>
+ #include <sys/kern/time.h>
+#include <stdint.h>
/*
Modified: trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff 2012-04-21 12:46:33 UTC (rev 4215)
+++ trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff 2012-04-21 13:10:37 UTC (rev 4216)
@@ -54,30 +54,12 @@
-};
-
#endif /* !_SYS__TIMEVAL_H_ */
---- a/sys/sys/bio.h
-+++ b/sys/sys/bio.h
-@@ -41,6 +41,15 @@
- #include <sys/queue.h>
- #include <stdint.h>
-
-+/* FIXME: this struct is copied from BSDish sys/time.h. It should be somewhere else. (maybe Glibc?) */
-+#ifndef bintime
-+#define bintime bintime
-+struct bintime {
-+ time_t sec;
-+ uint64_t frac;
-+};
-+#endif
-+
- /* bio_cmd */
- #define BIO_READ 0x01
- #define BIO_WRITE 0x02
--- a/sys/sys/devicestat.h
+++ b/sys/sys/devicestat.h
@@ -33,6 +33,8 @@
#include <sys/queue.h>
- #include <sys/time.h>
+ #include <sys/kern/time.h>
+#include <sys/_types.h>
+#include <sys/resource.h>
#include <stdint.h>
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff 2012-04-21 12:46:33 UTC (rev 4215)
+++ trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff 2012-04-21 13:10:37 UTC (rev 4216)
@@ -1,16 +0,0 @@
---- a/sys/sys/_types.h
-+++ b/sys/sys/_types.h
-@@ -103,4 +103,13 @@
- __int64_t _mbstateL; /* for alignment */
- } __mbstate_t;
-
-+/* FIXME: this belongs in <sys/time.h>. */
-+#ifndef bintime
-+#define bintime bintime
-+struct bintime {
-+ __time_t sec;
-+ __uint64_t frac;
-+};
-+#endif
-+
- #endif /* !_SYS__TYPES_H_ */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series 2012-04-21 12:46:33 UTC (rev 4215)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series 2012-04-21 13:10:37 UTC (rev 4216)
@@ -17,7 +17,6 @@
011_wine.diff
cpufunc.diff
015_cam.diff
-018_sys__types.diff
019_exec_pagesize.diff
020_concat_elf_generic.diff
022_sys_buf_h.diff
Modified: trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff 2012-04-21 12:46:33 UTC (rev 4215)
+++ trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff 2012-04-21 13:10:37 UTC (rev 4216)
@@ -59,7 +59,7 @@
typedef struct __mq *__mqd_t; /* mq_open()... */
typedef __uint32_t __uid_t;
typedef unsigned int __useconds_t; /* microseconds (unsigned) */
-@@ -98,10 +111,14 @@
+@@ -98,9 +111,13 @@
* mbstate_t is an opaque object to keep conversion state during multibyte
* stream conversions.
*/
@@ -72,8 +72,7 @@
} __mbstate_t;
+#endif
- /* FIXME: this belongs in <sys/time.h>. */
- #ifndef bintime
+ #endif /* !_SYS__TYPES_H_ */
--- a/sys/amd64/include/_types.h
+++ b/sys/amd64/include/_types.h
@@ -76,11 +76,19 @@
@@ -183,3 +182,83 @@
#ifndef _RLIM_T_DECLARED
typedef __rlim_t rlim_t; /* resource limit */
#define _RLIM_T_DECLARED
+--- a/sys/sys/time.h
++++ b/sys/sys/time.h
+@@ -36,11 +36,8 @@
+ #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 */
+-};
+ #define DST_NONE 0 /* not on dst */
+ #define DST_USA 1 /* USA style dst */
+ #define DST_AUST 2 /* Australian style dst */
+@@ -50,11 +47,6 @@
+ #define DST_CAN 6 /* Canada */
+
+ #if __BSD_VISIBLE
+-struct bintime {
+- time_t sec;
+- uint64_t frac;
+-};
+-
+ static __inline void
+ bintime_addx(struct bintime *bt, uint64_t x)
+ {
+@@ -199,7 +191,7 @@
+
+ #endif /* _KERNEL */
+
+-#ifndef _KERNEL /* NetBSD/OpenBSD compatible interfaces */
++#if 0
+
+ #define timerclear(tvp) ((tvp)->tv_sec = (tvp)->tv_usec = 0)
+ #define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
+@@ -227,6 +219,7 @@
+ } while (0)
+ #endif
+
++#if 0
+ /*
+ * Names of the interval timers, and structure
+ * defining a timer setting.
+@@ -239,17 +232,7 @@
+ struct timeval it_interval; /* timer interval */
+ struct timeval it_value; /* current value */
+ };
+-
+-/*
+- * Getkerninfo clock information structure
+- */
+-struct clockinfo {
+- int hz; /* clock frequency */
+- int tick; /* micro-seconds per hz tick */
+- int spare;
+- int stathz; /* statistics clock frequency */
+- int profhz; /* profiling clock frequency */
+-};
++#endif
+
+ /* These macros are also in time.h. */
+ #ifndef CLOCK_REALTIME
+--- a/sys/sys/timespec.h
++++ b/sys/sys/timespec.h
+@@ -51,6 +51,7 @@
+
+ #endif /* __BSD_VISIBLE */
+
++#if 0
+ /*
+ * Structure defined by POSIX.1b to be like a itimerval, but with
+ * timespecs. Used in the timer_*() system calls.
+@@ -59,5 +60,6 @@
+ struct timespec it_interval;
+ struct timespec it_value;
+ };
++#endif
+
+ #endif /* _SYS_TIMESPEC_H_ */
Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules 2012-04-21 12:46:33 UTC (rev 4215)
+++ trunk/kfreebsd-kernel-headers/debian/rules 2012-04-21 13:10:37 UTC (rev 4216)
@@ -73,6 +73,7 @@
-e 's/#\s*ifndef\s*_SYS_CDEFS_H_\(\s\|$$\)/#ifndef _SYS_CDEFS_H/g' \
\
-e 's/#\s*include\s\+<sys\/types\.h>\s*/#include <sys\/kern\/types.h>/g' \
+ -e 's/#\s*include\s\+<sys\/time\.h>\s*/#include <sys\/kern\/time.h>/g' \
\
-e 's/__size_t/size_t/g' \
; done) ; \
Modified: trunk/kfreebsd-kernel-headers/test/Makefile
===================================================================
--- trunk/kfreebsd-kernel-headers/test/Makefile 2012-04-21 12:46:33 UTC (rev 4215)
+++ trunk/kfreebsd-kernel-headers/test/Makefile 2012-04-21 13:10:37 UTC (rev 4216)
@@ -1,5 +1,6 @@
TESTS = \
type_collision.o \
+ time_collision.o \
uintXX_t.o \
\
bus.o \
Added: trunk/kfreebsd-kernel-headers/test/time_collision.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/time_collision.c (rev 0)
+++ trunk/kfreebsd-kernel-headers/test/time_collision.c 2012-04-21 13:10:37 UTC (rev 4216)
@@ -0,0 +1,2 @@
+#include <sys/time.h>
+#include <sys/kern/time.h>
More information about the Glibc-bsd-commits
mailing list