blob: b5736446892dd8fb5feace4d573d6b11db46eb76 (
plain)
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
|
Index: mformat.c
===================================================================
--- mformat.c.orig
+++ mformat.c
@@ -19,6 +19,7 @@
*/
#define DONT_NEED_WAIT
+#define DONT_NEED_IN
#include "sysincludes.h"
#include "msdos.h"
@@ -48,7 +49,7 @@
#define _LINUX_STRING_H_
#define kdev_t int
-#include "linux/fs.h"
+#include "sys/mount.h"
#undef _LINUX_STRING_H_
#endif
Index: mpartition.c
===================================================================
--- mpartition.c.orig
+++ mpartition.c
@@ -17,6 +17,7 @@
* mformat.c
*/
#define DONT_NEED_WAIT
+#define DONT_NEED_IN
#include "sysincludes.h"
#include "msdos.h"
@@ -35,7 +36,7 @@
#define _LINUX_STRING_H_
#define kdev_t int
-#include "linux/fs.h"
+#include "sys/mount.h"
#undef _LINUX_STRING_H_
#endif
Index: sysincludes.h
===================================================================
--- sysincludes.h.orig
+++ sysincludes.h
@@ -331,12 +331,16 @@ typedef unsigned int uid_t;
#endif
#ifdef HAVE_NETINET_IN_H
+#ifndef DONT_NEED_IN
#include <netinet/in.h>
#endif
+#endif
#ifdef HAVE_ARPA_INET_H
+#ifndef DONT_NEED_IN
#include <arpa/inet.h>
#endif
+#endif
#ifdef HAVE_NETDB_H
#include <netdb.h>
|
