X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ac99782d2245327973139539118c449d576d90a0..6ee9bd563bfa2f5797a034d49071f6c85c18001f:/tools/mtd-utils/patches/110-portability.patch

diff --git a/tools/mtd-utils/patches/110-portability.patch b/tools/mtd-utils/patches/110-portability.patch
index 3d0037c90..43b4faaca 100644
--- a/tools/mtd-utils/patches/110-portability.patch
+++ b/tools/mtd-utils/patches/110-portability.patch
@@ -30,16 +30,6 @@
  
  struct rb_node
  {
-@@ -131,7 +130,9 @@ static inline void rb_set_color(struct r
- 
- #define RB_ROOT	(struct rb_root) { NULL, }
- 
-+#ifndef offsetof
- #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-+#endif
- 
- #define container_of(ptr, type, member) ({                      \
-         const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
 --- a/include/mtd/ubi-media.h
 +++ b/include/mtd/ubi-media.h
 @@ -30,7 +30,15 @@
@@ -92,7 +82,7 @@
  
  	if (c->default_compr != UBIFS_COMPR_NONE)
  		use_flags |= UBIFS_COMPR_FL;
-+#ifdef __linux__
++#ifndef NO_NATIVE_SUPPORT
  	if (flags & FS_COMPR_FL)
  		use_flags |= UBIFS_COMPR_FL;
  	if (flags & FS_SYNC_FL)
@@ -108,7 +98,7 @@
  		fd = dirfd(dir);
  		if (fd == -1)
  			return sys_err_msg("dirfd failed");
-+#ifdef __linux__
++#ifndef NO_NATIVE_SUPPORT
  		if (ioctl(fd, FS_IOC_GETFLAGS, &flags) == -1)
 +#endif
  			flags = 0;
@@ -118,7 +108,7 @@
  		key_write(&key, &dn->key);
  		dn->size = cpu_to_le32(bytes_read);
  		out_len = NODE_BUFFER_SIZE - UBIFS_DATA_NODE_SZ;
-+#ifdef __linux__
++#ifndef NO_NATIVE_SUPPORT
  		if (c->default_compr == UBIFS_COMPR_NONE &&
  		    (flags & FS_COMPR_FL))
  			use_compr = UBIFS_COMPR_LZO;
@@ -131,7 +121,7 @@
  		if (fd == -1)
  			return sys_err_msg("failed to open file '%s'",
  					   path_name);
-+#ifdef __linux__
++#ifndef NO_NATIVE_SUPPORT
  		if (ioctl(fd, FS_IOC_GETFLAGS, &flags) == -1)
 +#endif
  			flags = 0;