aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-10-30 21:47:07 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-10-30 21:47:07 +0000
commit6fa3c3e899a34962ab9ac50181b1bac8c940cfc6 (patch)
tree1f33539bdce47caab58c8057c306b83dd5ea667f /tools
parent7323edfecd5aacefde59daaa869716f79ae8e01c (diff)
downloadupstream-6fa3c3e899a34962ab9ac50181b1bac8c940cfc6.tar.gz
upstream-6fa3c3e899a34962ab9ac50181b1bac8c940cfc6.tar.bz2
upstream-6fa3c3e899a34962ab9ac50181b1bac8c940cfc6.zip
mtd-utils: get rid of extern inline to fix build errors
Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport of r38565 git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@38618 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools')
-rw-r--r--tools/mtd-utils/patches/137-no_extern_inline.patch41
1 files changed, 41 insertions, 0 deletions
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;