Openwrt/tools/mtd-utils/patches/110-portability_fix.patch

62 lines
2.0 KiB
Diff

--- /dev/null
+++ b/include/asm/types.h
@@ -0,0 +1,3 @@
+#ifdef linux
+#include_next <asm/types.h>
+#endif
--- a/util/mkfs.jffs2.c
+++ b/util/mkfs.jffs2.c
@@ -68,6 +68,7 @@
#include <zlib.h>
#undef crc32
#include "crc32.h"
+#include <endian.h>
/* Do not use the wierd XPG version of basename */
#undef basename
@@ -1032,7 +1033,7 @@ static void recursive_populate_directory
case S_IFDIR:
if (verbose) {
printf("\td %04o %9lu %5d:%-3d %s\n",
- e->sb.st_mode & ~S_IFMT, e->sb.st_size,
+ e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size,
(int) (e->sb.st_uid), (int) (e->sb.st_gid),
e->name);
}
@@ -1041,7 +1042,7 @@ static void recursive_populate_directory
case S_IFSOCK:
if (verbose) {
printf("\ts %04o %9lu %5d:%-3d %s\n",
- e->sb.st_mode & ~S_IFMT, e->sb.st_size,
+ e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size,
(int) e->sb.st_uid, (int) e->sb.st_gid, e->name);
}
write_pipe(e);
@@ -1049,7 +1050,7 @@ static void recursive_populate_directory
case S_IFIFO:
if (verbose) {
printf("\tp %04o %9lu %5d:%-3d %s\n",
- e->sb.st_mode & ~S_IFMT, e->sb.st_size,
+ e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size,
(int) e->sb.st_uid, (int) e->sb.st_gid, e->name);
}
write_pipe(e);
@@ -1075,7 +1076,7 @@ static void recursive_populate_directory
case S_IFLNK:
if (verbose) {
printf("\tl %04o %9lu %5d:%-3d %s -> %s\n",
- e->sb.st_mode & ~S_IFMT, e->sb.st_size,
+ e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size,
(int) e->sb.st_uid, (int) e->sb.st_gid, e->name,
e->link);
}
@@ -1084,7 +1085,7 @@ static void recursive_populate_directory
case S_IFREG:
if (verbose) {
printf("\tf %04o %9lu %5d:%-3d %s\n",
- e->sb.st_mode & ~S_IFMT, e->sb.st_size,
+ e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size,
(int) e->sb.st_uid, (int) e->sb.st_gid, e->name);
}
write_regular_file(e);