squashfs4: fix a compile error on big-endian systems (patch from #9842)

[openwrt.git] / tools / squashfs4 / patches / 100-portability.patch

diff --git a/tools/squashfs4/patches/100-portability.patch b/tools/squashfs4/patches/100-portability.patch
index 4318c0c..ac1349c 100644 (file)
--- a/tools/squashfs4/patches/100-portability.patch
+++ b/tools/squashfs4/patches/100-portability.patch
@@ -1,17 +1,19 @@
---- a/squashfs-tools/global.h
-+++ b/squashfs-tools/global.h
-@@ -44,4 +44,8 @@ typedef long long squashfs_fragment_inde
- typedef squashfs_inode_t squashfs_inode;
- typedef squashfs_block_t squashfs_block;
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -60,6 +60,10 @@
+ #include <sys/sysinfo.h>
+ #endif

  
 +#ifndef FNM_EXTMATCH
 +#define FNM_EXTMATCH 0
 +#endif
 +
  
 +#ifndef FNM_EXTMATCH
 +#define FNM_EXTMATCH 0
 +#endif
 +

- #endif
+ #ifdef SQUASHFS_TRACE
+ #define TRACE(s, args...) \
+               do { \

 --- a/squashfs-tools/unsquashfs.h
 +++ b/squashfs-tools/unsquashfs.h
 --- a/squashfs-tools/unsquashfs.h
 +++ b/squashfs-tools/unsquashfs.h

-@@ -49,8 +49,10 @@
+@@ -49,8 +49,14 @@

  #define __BYTE_ORDER BYTE_ORDER
  #define __BIG_ENDIAN BIG_ENDIAN
  #define __LITTLE_ENDIAN LITTLE_ENDIAN
  #define __BYTE_ORDER BYTE_ORDER
  #define __BIG_ENDIAN BIG_ENDIAN
  #define __LITTLE_ENDIAN LITTLE_ENDIAN


@@ -19,6 +21,20 @@
  #else
  #include <endian.h>
 +#include <sys/sysinfo.h>
  #else
  #include <endian.h>
 +#include <sys/sysinfo.h>

++#endif
++
++#ifndef FNM_EXTMATCH
++#define FNM_EXTMATCH 0

  #endif
  
  #include "squashfs_fs.h"
  #endif
  
  #include "squashfs_fs.h"

+--- a/squashfs-tools/unsquashfs.c
++++ b/squashfs-tools/unsquashfs.c
+@@ -29,7 +29,6 @@
+ #include "compressor.h"
+ #include "xattr.h"
+ 
+-#include <sys/sysinfo.h>
+ #include <sys/types.h>
+ 
+ struct cache *fragment_cache, *data_cache;