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
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
|
--- diskdev_cmds-540.1.linux3.orig/fsck_hfs.tproj/dfalib/Scavenger.h
+++ diskdev_cmds-540.1.linux3/fsck_hfs.tproj/dfalib/Scavenger.h
@@ -48,7 +48,6 @@
#endif
#include <sys/errno.h>
#include <sys/param.h>
-#include <sys/sysctl.h>
#include <sys/mount.h>
#include <hfs/hfs_mount.h>
--- diskdev_cmds-540.1.linux3.orig/fsck_hfs.tproj/fsck_hfs.c
+++ diskdev_cmds-540.1.linux3/fsck_hfs.tproj/fsck_hfs.c
@@ -30,7 +30,6 @@
#include <sys/ioctl.h>
#if !LINUX
#include <sys/disk.h>
-#include <sys/sysctl.h>
#include <setjmp.h>
#endif
#include <hfs/hfs_mount.h>
--- diskdev_cmds-540.1.linux3.orig/newfs_hfs.tproj/makehfs.c
+++ diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c
@@ -38,7 +38,6 @@
#endif
#include <sys/errno.h>
#include <sys/stat.h>
-#include <sys/sysctl.h>
#if !LINUX
#include <sys/vmmeter.h>
#endif
--- a/fsck_hfs.tproj/utilities.c
+++ b/fsck_hfs.tproj/utilities.c
@@ -70,7 +70,6 @@
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
-#include <sys/sysctl.h>
#include "fsck_hfs.h"
--- diskdev_cmds-540.1.linux3.orig/fsck_hfs.tproj/dfalib/Scavenger.h
+++ diskdev_cmds-540.1.linux3/fsck_hfs.tproj/dfalib/Scavenger.h
@@ -46,7 +46,7 @@
#include <sys/kauth.h>
#include <sys/syslimits.h>
#endif
-#include <sys/errno.h>
+#include <errno.h>
#include <sys/param.h>
#include <sys/mount.h>
#include <hfs/hfs_mount.h>
--- diskdev_cmds-540.1.linux3.orig/fsck_hfs.tproj/utilities.c
+++ diskdev_cmds-540.1.linux3/fsck_hfs.tproj/utilities.c
@@ -55,7 +55,7 @@
#include <stddef.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <sys/errno.h>
+#include <errno.h>
#if LINUX
#include <limits.h>
#include <signal.h>
--- diskdev_cmds-540.1.linux3.orig/newfs_hfs.tproj/makehfs.c
+++ diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c
@@ -36,7 +36,7 @@
#include <time.h>
#include "missing.h"
#endif
-#include <sys/errno.h>
+#include <errno.h>
#include <sys/stat.h>
#if !LINUX
#include <sys/vmmeter.h>
--- a/fsck_hfs.tproj/cache.h
+++ b/fsck_hfs.tproj/cache.h
@@ -29,6 +29,7 @@
#ifndef _CACHE_H_
#define _CACHE_H_
#include <stdint.h>
+#include <sys/types.h>
/* Different values for initializing cache */
enum {
--- a/newfs_hfs.tproj/makehfs.c
+++ b/newfs_hfs.tproj/makehfs.c
@@ -41,6 +41,7 @@
#if !LINUX
#include <sys/vmmeter.h>
#endif
+#include <sys/cdefs.h>
#include <err.h>
#include <errno.h>
--- a/newfs_hfs.tproj/newfs_hfs.c
+++ b/newfs_hfs.tproj/newfs_hfs.c
@@ -42,6 +42,7 @@
#if LINUX
#include <time.h>
#endif
+#include <sys/cdefs.h>
#if !LINUX
#include <IOKit/storage/IOMediaBSDClient.h>
--- a/fsck_hfs.tproj/fsck_hfs.h
+++ b/fsck_hfs.tproj/fsck_hfs.h
@@ -22,6 +22,7 @@
*/
#include "cache.h"
+#include <sys/cdefs.h>
const extern char *cdevname; /* name of device being checked */
--- a/fsck_hfs.tproj/utilities.c
+++ b/fsck_hfs.tproj/utilities.c
@@ -785,7 +785,7 @@
if (!live_fsck) {
/* copy va_list as it will be used again later */
- __va_copy(ap_stdout, ap);
+ va_copy(ap_stdout, ap);
vfprintf(stdout, fmt, ap_stdout);
}
--- a/fsck_hfs.tproj/fsck_messages.c
+++ b/fsck_hfs.tproj/fsck_messages.c
@@ -85,7 +85,7 @@
if (c == NULL)
return;
- __va_copy(ap2, ap); // Just in case we need it
+ va_copy(ap2, ap); // Just in case we need it
length = vsnprintf(buf, BUFSIZ, fmt, ap);
if (length > BUFSIZ) {
// We need to allocate space for it
|
