diff options
| author | Alex Maclean <monkeh@monkeh.net> | 2017-10-23 13:48:19 +0100 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2017-10-25 18:50:27 +0200 |
| commit | 8a48a53dcb503137a8eac64cf3fc522024484818 (patch) | |
| tree | f85f62c0ec60b01e93fe2b4ad3852bbd53e35ba2 /tools/squashfs4/patches/170-add_support_for_LZMA_MAGIC_to_unsqashfs.patch | |
| parent | 8406e50df540b13a43c080a304ec675bc4fc2caf (diff) | |
| download | upstream-8a48a53dcb503137a8eac64cf3fc522024484818.tar.gz upstream-8a48a53dcb503137a8eac64cf3fc522024484818.tar.bz2 upstream-8a48a53dcb503137a8eac64cf3fc522024484818.zip | |
tools/squashfs4: include sysmacros.h explicitly
glibc is moving to remove the include of sys/sysmacros.h from
sys/types.h, and some distros have done this early. Other libcs may
already lack this include. Include sysmacros.h explicitly.
Fixes: FS#1017
Signed-off-by: Alex Maclean <monkeh@monkeh.net>
[refresh patches]
Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'tools/squashfs4/patches/170-add_support_for_LZMA_MAGIC_to_unsqashfs.patch')
| -rw-r--r-- | tools/squashfs4/patches/170-add_support_for_LZMA_MAGIC_to_unsqashfs.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/squashfs4/patches/170-add_support_for_LZMA_MAGIC_to_unsqashfs.patch b/tools/squashfs4/patches/170-add_support_for_LZMA_MAGIC_to_unsqashfs.patch index ad69b190ea..bc7d6c7a4a 100644 --- a/tools/squashfs4/patches/170-add_support_for_LZMA_MAGIC_to_unsqashfs.patch +++ b/tools/squashfs4/patches/170-add_support_for_LZMA_MAGIC_to_unsqashfs.patch @@ -16,7 +16,7 @@ #define SQUASHFS_METADATA_LOG 13 --- a/squashfs-tools/unsquashfs.c +++ b/squashfs-tools/unsquashfs.c -@@ -1463,10 +1463,12 @@ int read_super(char *source) +@@ -1464,10 +1464,12 @@ int read_super(char *source) */ read_fs_bytes(fd, SQUASHFS_START, sizeof(struct squashfs_super_block), &sBlk_4); @@ -31,7 +31,7 @@ sBlk_4.s_minor == 0) { s_ops.squashfs_opendir = squashfs_opendir_4; s_ops.read_fragment = read_fragment_4; -@@ -1479,7 +1481,11 @@ int read_super(char *source) +@@ -1480,7 +1482,11 @@ int read_super(char *source) /* * Check the compression type */ @@ -44,7 +44,7 @@ return TRUE; } -@@ -1494,8 +1500,10 @@ int read_super(char *source) +@@ -1495,8 +1501,10 @@ int read_super(char *source) * Check it is a SQUASHFS superblock */ swap = 0; @@ -57,7 +57,7 @@ squashfs_super_block_3 sblk; ERROR("Reading a different endian SQUASHFS filesystem " "on %s\n", source); -@@ -1573,7 +1581,11 @@ int read_super(char *source) +@@ -1574,7 +1582,11 @@ int read_super(char *source) /* * 1.x, 2.x and 3.x filesystems use gzip compression. */ |