patch-squashfs-tools_mksquashfs_c 1.2 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. --- squashfs4.2.orig/squashfs-tools/mksquashfs.c 2011-02-28 23:24:09.000000000 +0100
  2. +++ squashfs4.2/squashfs-tools/mksquashfs.c 2014-03-29 15:02:16.000000000 +0100
  3. @@ -60,6 +60,10 @@
  4. #include <sys/sysinfo.h>
  5. #endif
  6. +#ifndef FNM_EXTMATCH
  7. +#define FNM_EXTMATCH 0
  8. +#endif
  9. +
  10. #ifdef SQUASHFS_TRACE
  11. #define TRACE(s, args...) \
  12. do { \
  13. @@ -721,13 +725,13 @@ void cache_block_put(struct file_buffer
  14. + (((char *)A) - data_cache)))
  15. -inline void inc_progress_bar()
  16. +static inline void inc_progress_bar()
  17. {
  18. cur_uncompressed ++;
  19. }
  20. -inline void update_progress_bar()
  21. +static inline void update_progress_bar()
  22. {
  23. pthread_mutex_lock(&progress_mutex);
  24. pthread_cond_signal(&progress_wait);
  25. @@ -735,7 +739,7 @@ inline void update_progress_bar()
  26. }
  27. -inline void waitforthread(int i)
  28. +static inline void waitforthread(int i)
  29. {
  30. TRACE("Waiting for thread %d\n", i);
  31. while(thread[i] != 0)
  32. @@ -3340,7 +3344,7 @@ struct inode_info *lookup_inode(struct s
  33. }
  34. -inline void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir,
  35. +static inline void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir,
  36. struct inode_info *inode_info, struct dir_info *dir)
  37. {
  38. if((dir->count % DIR_ENTRIES) == 0) {