ubi-utils: fix build with gcc5

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 46610
master
Hauke Mehrtens 9 years ago
parent b1bd85c40e
commit 4ab1830682
  1. 2
      package/utils/ubi-utils/patches/010-fix-rpmatch.patch
  2. 41
      package/utils/ubi-utils/patches/110-gcc5-fix.patch
  3. 2
      package/utils/ubi-utils/patches/130-lzma_jffs2.patch

@ -1,6 +1,6 @@
--- a/include/common.h
+++ b/include/common.h
@@ -122,10 +122,12 @@
@@ -137,10 +137,12 @@ static inline bool prompt(const char *ms
}
if (strcmp("\n", line) != 0) {

@ -0,0 +1,41 @@
--- a/mkfs.ubifs/hashtable/hashtable_itr.c
+++ b/mkfs.ubifs/hashtable/hashtable_itr.c
@@ -35,18 +35,6 @@ hashtable_iterator(struct hashtable *h)
}
/*****************************************************************************/
-/* key - return the key of the (key,value) pair at the current position */
-/* value - return the value of the (key,value) pair at the current position */
-
-void *
-hashtable_iterator_key(struct hashtable_itr *i)
-{ return i->e->k; }
-
-void *
-hashtable_iterator_value(struct hashtable_itr *i)
-{ return i->e->v; }
-
-/*****************************************************************************/
/* advance - advance the iterator to the next element
* returns zero if advanced to end of table */
--- a/mkfs.ubifs/hashtable/hashtable_itr.h
+++ b/mkfs.ubifs/hashtable/hashtable_itr.h
@@ -28,7 +28,7 @@ hashtable_iterator(struct hashtable *h);
/* hashtable_iterator_key
* - return the value of the (key,value) pair at the current position */
-extern inline void *
+static inline void *
hashtable_iterator_key(struct hashtable_itr *i)
{
return i->e->k;
@@ -37,7 +37,7 @@ hashtable_iterator_key(struct hashtable_
/*****************************************************************************/
/* value - return the value of the (key,value) pair at the current position */
-extern inline void *
+static inline void *
hashtable_iterator_value(struct hashtable_itr *i)
{
return i->e->v;

@ -9,7 +9,7 @@
ifeq ($(WITHOUT_XATTR), 1)
CPPFLAGS += -DWITHOUT_XATTR
@@ -84,7 +84,7 @@
@@ -84,7 +84,7 @@ $(BUILDDIR)/include/version.h.tmp:
#
# Utils in top level
#

Loading…
Cancel
Save