diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2015-08-16 20:16:43 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2015-08-16 20:16:43 +0000 |
commit | ddb49cd76ed5dcca1a669bbb0da52417eabd3369 (patch) | |
tree | c72eb661a189144421517522f37cb4f034dbe74b /package/utils/ubi-utils/patches/110-gcc5-fix.patch | |
parent | 12e42f24e8e977773c01f7e7d5f407eb7fb52305 (diff) | |
download | master-187ad058-ddb49cd76ed5dcca1a669bbb0da52417eabd3369.tar.gz master-187ad058-ddb49cd76ed5dcca1a669bbb0da52417eabd3369.tar.bz2 master-187ad058-ddb49cd76ed5dcca1a669bbb0da52417eabd3369.zip |
ubi-utils: fix build with gcc5
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46610 3c298f89-4303-0410-b956-a3cf2f4a3e73
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, 41 insertions, 0 deletions
diff --git a/package/utils/ubi-utils/patches/110-gcc5-fix.patch b/package/utils/ubi-utils/patches/110-gcc5-fix.patch new file mode 100644 index 0000000000..d871d670d2 --- /dev/null +++ b/package/utils/ubi-utils/patches/110-gcc5-fix.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; |