forked from pool/mtools
Petr Gajdos
d0108fd2cb
* Fix for names of iconv encodings on AIX * Fix mt_size_t on NetBSD * Fixed compilation on Mingw * Fixed doc (especially mformat) * Fix mformat'ing of FAT12 filesystems with huge cluster sizes * Minfo prints image file name in mformat command line if an image file name was given * Always generate gzip-compressed RPMs, in order to remain compatible with older distributions * Fixed buffer overflow with drive letter in mclasserase - extended fat-bits.patch: add fat_bits parameter again to fat_read() and old_fat_read(); it is candidate to drop though OBS-URL: https://build.opensuse.org/package/show/Base:System/mtools?expand=0&rev=33
64 lines
1.2 KiB
Diff
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>
|