aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Maclean <monkeh@monkeh.net>2017-10-23 13:47:55 +0100
committerMathias Kresin <dev@kresin.me>2017-10-25 18:50:27 +0200
commit8406e50df540b13a43c080a304ec675bc4fc2caf (patch)
treeed88dcbea30ad4fc3bbc720375606361bc14f30a
parent96dbf59e5ae9b2384d860008f92cb583412c1688 (diff)
downloadupstream-8406e50df540b13a43c080a304ec675bc4fc2caf.tar.gz
upstream-8406e50df540b13a43c080a304ec675bc4fc2caf.tar.bz2
upstream-8406e50df540b13a43c080a304ec675bc4fc2caf.zip
tools/squashfs: 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#1018 Signed-off-by: Alex Maclean <monkeh@monkeh.net>
-rw-r--r--tools/squashfs/patches/130-include_sysmacros.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/tools/squashfs/patches/130-include_sysmacros.patch b/tools/squashfs/patches/130-include_sysmacros.patch
new file mode 100644
index 0000000000..f0149d6f65
--- /dev/null
+++ b/tools/squashfs/patches/130-include_sysmacros.patch
@@ -0,0 +1,20 @@
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -30,6 +30,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <errno.h>
+--- a/squashfs-tools/unsquashfs.c
++++ b/squashfs-tools/unsquashfs.c
+@@ -25,6 +25,7 @@
+ #define FALSE 0
+ #include <stdio.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <errno.h>