1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
---
sys/amd64/include/md_var.h | 2 ++
sys/cam/scsi/scsi_all.h | 1 +
sys/i386/include/md_var.h | 2 ++
sys/sys/_mutex.h | 2 ++
sys/sys/_timeval.h | 9 +--------
sys/sys/bio.h | 9 +++++++++
sys/sys/devicestat.h | 3 +++
sys/sys/timespec.h | 5 +----
8 files changed, 21 insertions(+), 12 deletions(-)
--- a/sys/i386/include/md_var.h
+++ b/sys/i386/include/md_var.h
@@ -32,6 +32,8 @@
#ifndef _MACHINE_MD_VAR_H_
#define _MACHINE_MD_VAR_H_
+#include <sys/_types.h>
+
/*
* Miscellaneous machine-dependent declarations.
*/
--- a/sys/amd64/include/md_var.h
+++ b/sys/amd64/include/md_var.h
@@ -32,6 +32,8 @@
#ifndef _MACHINE_MD_VAR_H_
#define _MACHINE_MD_VAR_H_
+#include <sys/_types.h>
+
/*
* Miscellaneous machine-dependent declarations.
*/
--- a/sys/sys/_timeval.h
+++ b/sys/sys/_timeval.h
@@ -30,6 +30,7 @@
#define _SYS__TIMEVAL_H_
#include <sys/_types.h>
+#include <sys/time.h>
#ifndef _SUSECONDS_T_DECLARED
typedef __suseconds_t suseconds_t;
@@ -41,12 +42,4 @@
#define _TIME_T_DECLARED
#endif
-/*
- * Structure returned by gettimeofday(2) system call, and used in other calls.
- */
-struct timeval {
- time_t tv_sec; /* seconds */
- suseconds_t tv_usec; /* and microseconds */
-};
-
#endif /* !_SYS__TIMEVAL_H_ */
--- a/sys/sys/devicestat.h
+++ b/sys/sys/devicestat.h
@@ -33,6 +33,8 @@
#include <sys/kern/queue.h>
#include <sys/kern/time.h>
+#include <sys/_types.h>
+#include <sys/resource.h>
#include <stdint.h>
/*
--- a/sys/sys/timespec.h
+++ b/sys/sys/timespec.h
@@ -35,7 +35,7 @@
#define _SYS_TIMESPEC_H_
#include <sys/cdefs.h>
-#include <sys/_timespec.h>
+#include <sys/time.h>
#if __USE_BSD
#define TIMEVAL_TO_TIMESPEC(tv, ts) \
|
