2021-06-21 07:49:47 +02:00
|
|
|
Index: mtools-4.0.31/mformat.c
|
2009-12-04 12:22:19 +01:00
|
|
|
===================================================================
|
2021-06-21 07:49:47 +02:00
|
|
|
--- mtools-4.0.31.orig/mformat.c
|
|
|
|
+++ mtools-4.0.31/mformat.c
|
2009-12-04 12:22:19 +01:00
|
|
|
@@ -19,6 +19,7 @@
|
2007-01-16 00:25:55 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
#define DONT_NEED_WAIT
|
|
|
|
+#define DONT_NEED_IN
|
|
|
|
|
|
|
|
#include "sysincludes.h"
|
|
|
|
#include "msdos.h"
|
2021-06-21 07:49:47 +02:00
|
|
|
@@ -44,7 +45,7 @@
|
2007-01-16 00:25:55 +01:00
|
|
|
|
2021-06-21 07:49:47 +02:00
|
|
|
#ifdef OS_linux
|
|
|
|
#include "linux/hdreg.h"
|
2007-01-16 00:25:55 +01:00
|
|
|
-#include "linux/fs.h"
|
|
|
|
+#include "sys/mount.h"
|
|
|
|
|
|
|
|
#endif
|
2021-06-21 07:49:47 +02:00
|
|
|
|
|
|
|
Index: mtools-4.0.31/mpartition.c
|
2009-12-04 12:22:19 +01:00
|
|
|
===================================================================
|
2021-06-21 07:49:47 +02:00
|
|
|
--- mtools-4.0.31.orig/mpartition.c
|
|
|
|
+++ mtools-4.0.31/mpartition.c
|
2009-12-04 12:22:19 +01:00
|
|
|
@@ -17,6 +17,7 @@
|
2007-01-16 00:25:55 +01:00
|
|
|
* mformat.c
|
|
|
|
*/
|
|
|
|
#define DONT_NEED_WAIT
|
|
|
|
+#define DONT_NEED_IN
|
|
|
|
|
|
|
|
#include "sysincludes.h"
|
|
|
|
#include "msdos.h"
|
2021-06-21 07:49:47 +02:00
|
|
|
@@ -33,7 +34,7 @@
|
2007-01-16 00:25:55 +01:00
|
|
|
|
2021-06-21 07:49:47 +02:00
|
|
|
#ifdef OS_linux
|
|
|
|
#include "linux/hdreg.h"
|
2007-01-16 00:25:55 +01:00
|
|
|
-#include "linux/fs.h"
|
|
|
|
+#include "sys/mount.h"
|
|
|
|
#endif
|
2021-06-21 07:49:47 +02:00
|
|
|
|
|
|
|
static void set_offset(hsc *h, unsigned long offset,
|
|
|
|
Index: mtools-4.0.31/sysincludes.h
|
2009-12-04 12:22:19 +01:00
|
|
|
===================================================================
|
2021-06-21 07:49:47 +02:00
|
|
|
--- mtools-4.0.31.orig/sysincludes.h
|
|
|
|
+++ mtools-4.0.31/sysincludes.h
|
|
|
|
@@ -382,12 +382,16 @@ extern int errno;
|
2007-01-16 00:25:55 +01:00
|
|
|
#endif
|
|
|
|
|
2018-12-28 19:06:07 +01:00
|
|
|
#ifdef HAVE_NETINET_TCP_H
|
2007-01-16 00:25:55 +01:00
|
|
|
+#ifndef DONT_NEED_IN
|
2018-12-28 19:06:07 +01:00
|
|
|
#include <netinet/tcp.h>
|
2007-01-16 00:25:55 +01:00
|
|
|
#endif
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_ARPA_INET_H
|
|
|
|
+#ifndef DONT_NEED_IN
|
|
|
|
#include <arpa/inet.h>
|
|
|
|
#endif
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_NETDB_H
|
|
|
|
#include <netdb.h>
|