| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch |
| 2 | |
| 3 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 4 | |
| 5 | Upstream-Status: Pending |
| 6 | |
| 7 | |
| 8 | sys/types.h might not always include sys/sysmacros.h for major/minor/makedev |
| 9 | |
| 10 | --- a/squashfs-tools/mksquashfs.c |
| 11 | +++ b/squashfs-tools/mksquashfs.c |
| 12 | @@ -59,6 +59,7 @@ |
| 13 | #else |
| 14 | #include <endian.h> |
| 15 | #include <sys/sysinfo.h> |
| 16 | +#include <sys/sysmacros.h> |
| 17 | #endif |
| 18 | |
| 19 | #include "squashfs_fs.h" |
| 20 | --- a/squashfs-tools/unsquashfs.c |
| 21 | +++ b/squashfs-tools/unsquashfs.c |
| Brad Bishop | 96ff198 | 2019-08-19 13:50:42 -0400 | [diff] [blame^] | 22 | @@ -40,6 +40,10 @@ |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 23 | #include <limits.h> |
| 24 | #include <ctype.h> |
| 25 | |
| 26 | +#ifdef linux |
| 27 | +#include <sys/sysmacros.h> |
| 28 | +#endif |
| 29 | + |
| 30 | struct cache *fragment_cache, *data_cache; |
| 31 | struct queue *to_reader, *to_inflate, *to_writer, *from_writer; |
| 32 | pthread_t *thread, *inflator_thread; |