diff options
| author | Alex Maclean <monkeh@monkeh.net> | 2017-10-23 13:48:19 +0100 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2017-10-27 11:19:38 +0200 |
| commit | 4425fa84dad57b6b0046b97e224d50b33f1f536b (patch) | |
| tree | a35eb5584ca74a955fb4bd8bb9436fa065702591 /tools/squashfs4/patches/190-no_nonstatic_inline.patch | |
| parent | 09bfca653c0ce9db3588c4046c53b28ae67eddbe (diff) | |
| download | upstream-4425fa84dad57b6b0046b97e224d50b33f1f536b.tar.gz upstream-4425fa84dad57b6b0046b97e224d50b33f1f536b.tar.bz2 upstream-4425fa84dad57b6b0046b97e224d50b33f1f536b.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/190-no_nonstatic_inline.patch')
| -rw-r--r-- | tools/squashfs4/patches/190-no_nonstatic_inline.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/squashfs4/patches/190-no_nonstatic_inline.patch b/tools/squashfs4/patches/190-no_nonstatic_inline.patch index 27ebc6a263..8cab120832 100644 --- a/tools/squashfs4/patches/190-no_nonstatic_inline.patch +++ b/tools/squashfs4/patches/190-no_nonstatic_inline.patch @@ -1,6 +1,6 @@ --- a/squashfs-tools/mksquashfs.c +++ b/squashfs-tools/mksquashfs.c -@@ -735,13 +735,13 @@ void cache_block_put(struct file_buffer +@@ -736,13 +736,13 @@ void cache_block_put(struct file_buffer + (((char *)A) - data_cache))) @@ -16,7 +16,7 @@ { pthread_mutex_lock(&progress_mutex); pthread_cond_signal(&progress_wait); -@@ -749,7 +749,7 @@ inline void update_progress_bar() +@@ -750,7 +750,7 @@ inline void update_progress_bar() } @@ -25,7 +25,7 @@ { TRACE("Waiting for thread %d\n", i); while(thread[i] != 0) -@@ -3358,7 +3358,7 @@ struct inode_info *lookup_inode(struct s +@@ -3359,7 +3359,7 @@ struct inode_info *lookup_inode(struct s } |