aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-10-28 15:15:16 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-10-28 15:15:16 +0000
commit7a59e5b36860ff6691dff5b01365098a9ff9bb34 (patch)
treeccf631c4d402a43bfce8920a5deb760a3931227e
parent8fb4f34859150fdf1432ede4fb8c5b4a653dd362 (diff)
downloadupstream-7a59e5b36860ff6691dff5b01365098a9ff9bb34.tar.gz
upstream-7a59e5b36860ff6691dff5b01365098a9ff9bb34.tar.bz2
upstream-7a59e5b36860ff6691dff5b01365098a9ff9bb34.zip
squashfs4: make inline functions static to fix build errors
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 38562
-rw-r--r--tools/squashfs4/patches/190-no_nonstatic_inline.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/tools/squashfs4/patches/190-no_nonstatic_inline.patch b/tools/squashfs4/patches/190-no_nonstatic_inline.patch
new file mode 100644
index 0000000000..7b5808afab
--- /dev/null
+++ b/tools/squashfs4/patches/190-no_nonstatic_inline.patch
@@ -0,0 +1,36 @@
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -735,13 +735,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);
+@@ -749,7 +749,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)
+@@ -3358,7 +3358,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) {