4425fa84da
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>
36 lines
970 B
Diff
36 lines
970 B
Diff
--- a/squashfs-tools/mksquashfs.c
|
|
+++ b/squashfs-tools/mksquashfs.c
|
|
@@ -736,13 +736,13 @@ void cache_block_put(struct file_buffer
|
|
+ (((char *)A) - data_cache)))
|
|
|
|
|
|
-inline void inc_progress_bar()
|
|
+static inline void inc_progress_bar()
|
|
{
|
|
cur_uncompressed ++;
|
|
}
|
|
|
|
|
|
-inline void update_progress_bar()
|
|
+static inline void update_progress_bar()
|
|
{
|
|
pthread_mutex_lock(&progress_mutex);
|
|
pthread_cond_signal(&progress_wait);
|
|
@@ -750,7 +750,7 @@ inline void update_progress_bar()
|
|
}
|
|
|
|
|
|
-inline void waitforthread(int i)
|
|
+static inline void waitforthread(int i)
|
|
{
|
|
TRACE("Waiting for thread %d\n", i);
|
|
while(thread[i] != 0)
|
|
@@ -3359,7 +3359,7 @@ struct inode_info *lookup_inode(struct s
|
|
}
|
|
|
|
|
|
-inline void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir,
|
|
+static inline void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir,
|
|
struct inode_info *inode_info, struct dir_info *dir)
|
|
{
|
|
if((dir->count % DIR_ENTRIES) == 0) {
|