forked from pool/mtools
78 lines
1.3 KiB
Diff
78 lines
1.3 KiB
Diff
|
--- mformat.c
|
||
|
|
+++ mformat.c
|
||
|
|
@@ -3,6 +3,7 @@
|
||
|
|
*/
|
||
|
|
|
||
|
|
#define DONT_NEED_WAIT
|
||
|
|
+#define DONT_NEED_IN
|
||
|
|
|
||
|
|
#include "sysincludes.h"
|
||
|
|
#include "msdos.h"
|
||
|
|
@@ -31,7 +32,7 @@
|
||
|
|
|
||
|
|
#define _LINUX_STRING_H_
|
||
|
|
#define kdev_t int
|
||
|
|
-#include "linux/fs.h"
|
||
|
|
+#include "sys/mount.h"
|
||
|
|
#undef _LINUX_STRING_H_
|
||
|
|
|
||
|
|
#endif
|
||
|
|
--- mmount.c
|
||
|
|
+++ mmount.c
|
||
|
|
@@ -60,7 +60,7 @@
|
||
|
|
if ( argc > 2 )
|
||
|
|
execvp("mount", argv + 1 );
|
||
|
|
else
|
||
|
|
- execlp("mount", "mount", name, 0);
|
||
|
|
+ execlp("mount", "mount", name, NULL);
|
||
|
|
perror("exec mount");
|
||
|
|
exit(1);
|
||
|
|
default:
|
||
|
|
@@ -77,7 +77,7 @@
|
||
|
|
if ( argc > 2 )
|
||
|
|
execvp("mount", argv);
|
||
|
|
else
|
||
|
|
- execlp("mount", "mount","-r", name, 0);
|
||
|
|
+ execlp("mount", "mount","-r", name, NULL);
|
||
|
|
exit(1);
|
||
|
|
}
|
||
|
|
|
||
|
|
--- mpartition.c
|
||
|
|
+++ mpartition.c
|
||
|
|
@@ -2,6 +2,7 @@
|
||
|
|
* mformat.c
|
||
|
|
*/
|
||
|
|
#define DONT_NEED_WAIT
|
||
|
|
+#define DONT_NEED_IN
|
||
|
|
|
||
|
|
#include "sysincludes.h"
|
||
|
|
#include "msdos.h"
|
||
|
|
@@ -20,7 +21,7 @@
|
||
|
|
|
||
|
|
#define _LINUX_STRING_H_
|
||
|
|
#define kdev_t int
|
||
|
|
-#include "linux/fs.h"
|
||
|
|
+#include "sys/mount.h"
|
||
|
|
#undef _LINUX_STRING_H_
|
||
|
|
|
||
|
|
#endif
|
||
|
|
--- sysincludes.h
|
||
|
|
+++ sysincludes.h
|
||
|
|
@@ -268,12 +268,16 @@
|
||
|
|
#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>
|