diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-10-30 21:47:04 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-10-30 21:47:04 +0000 |
| commit | ff63ea8b4d214cb8dcd12515da5b2e5e4d725e3e (patch) | |
| tree | c3b571dff2f2da4d3a3b85781b21f9689bb067c5 | |
| parent | 2ae80c944ff17e0a19d916cc1e81dc8f597c5457 (diff) | |
| download | upstream-ff63ea8b4d214cb8dcd12515da5b2e5e4d725e3e.tar.gz upstream-ff63ea8b4d214cb8dcd12515da5b2e5e4d725e3e.tar.bz2 upstream-ff63ea8b4d214cb8dcd12515da5b2e5e4d725e3e.zip | |
squashfs4: make inline functions static to fix build errors
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r38562
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@38615 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | tools/squashfs4/patches/190-no_nonstatic_inline.patch | 36 |
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) { |