diff options
author | John Crispin <john@phrozen.org> | 2016-07-06 10:32:07 +0200 |
---|---|---|
committer | John Crispin <john@phrozen.org> | 2016-07-11 14:19:47 +0200 |
commit | 9352603fff591a2412fb825aa2f5ef386990c99a (patch) | |
tree | 2109db9939ab0ba838a0cb86afa61a51a36932ff /package/utils/ubi-utils/patches/110-gcc5-fix.patch | |
parent | 17f4d3967eec59db147d2f5b1c45dc9cf30a883e (diff) | |
download | upstream-9352603fff591a2412fb825aa2f5ef386990c99a.tar.gz upstream-9352603fff591a2412fb825aa2f5ef386990c99a.tar.bz2 upstream-9352603fff591a2412fb825aa2f5ef386990c99a.zip |
mtd-utils: merge ubi/nand-utils into one package
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'package/utils/ubi-utils/patches/110-gcc5-fix.patch')
-rw-r--r-- | package/utils/ubi-utils/patches/110-gcc5-fix.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/package/utils/ubi-utils/patches/110-gcc5-fix.patch b/package/utils/ubi-utils/patches/110-gcc5-fix.patch deleted file mode 100644 index d871d670d2..0000000000 --- a/package/utils/ubi-utils/patches/110-gcc5-fix.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- 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; |