From 8dff4713a6dda7969a0e0e723a3e6e4128ead14a Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 30 Oct 2013 21:47:07 +0000 Subject: [PATCH] mtd-utils: get rid of extern inline to fix build errors Signed-off-by: Felix Fietkau Backport of r38565 SVN-Revision: 38618 --- .../patches/137-no_extern_inline.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 tools/mtd-utils/patches/137-no_extern_inline.patch diff --git a/tools/mtd-utils/patches/137-no_extern_inline.patch b/tools/mtd-utils/patches/137-no_extern_inline.patch new file mode 100644 index 0000000000..d871d670d2 --- /dev/null +++ b/tools/mtd-utils/patches/137-no_extern_inline.patch @@ -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; -- 2.30.2