1234567891011121314151617181920212223242526272829303132333435363738394041424344454647 |
- --- squashfs4.2.orig/squashfs-tools/mksquashfs.c 2011-02-28 23:24:09.000000000 +0100
- +++ squashfs4.2/squashfs-tools/mksquashfs.c 2014-03-29 15:02:16.000000000 +0100
- @@ -60,6 +60,10 @@
- #include <sys/sysinfo.h>
- #endif
-
- +#ifndef FNM_EXTMATCH
- +#define FNM_EXTMATCH 0
- +#endif
- +
- #ifdef SQUASHFS_TRACE
- #define TRACE(s, args...) \
- do { \
- @@ -721,13 +725,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);
- @@ -735,7 +739,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)
- @@ -3340,7 +3344,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) {
|