1
0
forked from pool/mtools
mtools/mtools-prototypes.diff
Petr Gajdos e42a16d143 - patches unversioned; makes update and reviews easier
* mtools-4.0.18-fat-bits.diff -> mtools-fat-bits.diff
  * mtools-4.0.18-conf.diff -> mtools-conf.diff
  * mtools-4.0.18-aliasing.diff -> mtools-aliasing.diff
  * mtools-4.0.18-prototypes.diff -> mtools-prototypes.diff
  * mtools-4.0.18-autoconf.diff -> mtools-autoconf.diff

OBS-URL: https://build.opensuse.org/package/show/Base:System/mtools?expand=0&rev=49
2018-10-31 06:55:23 +00:00

64 lines
1.2 KiB
Diff

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>