aboutsummaryrefslogtreecommitdiffstats
path: root/tools/mtd-utils/patches/137-no_extern_inline.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-12-05 15:44:58 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2015-12-05 15:44:58 +0000
commite27c8bb15651f8b5dfd5732306e26e6fa8cb0c0a (patch)
tree411d7f31a4efb625893da1dc375b1c84d43ce6fa /tools/mtd-utils/patches/137-no_extern_inline.patch
parent3fd67b7f41785cbe84f8dfae2cdfa0d8ec8652fd (diff)
downloadupstream-e27c8bb15651f8b5dfd5732306e26e6fa8cb0c0a.tar.gz
upstream-e27c8bb15651f8b5dfd5732306e26e6fa8cb0c0a.tar.bz2
upstream-e27c8bb15651f8b5dfd5732306e26e6fa8cb0c0a.zip
update mtd-utils to 1.5.2
- update mtd-utils to 1.5.2 (git a494d30ab1ae40cb7665680cadf5af3ca3830a73) - remove patches that went upstream - fixes build from scratch as of broken patches Signed-off-by: Sven Roederer <devel-sven@geroedel.de> [use the final version of 1.5.2 instead, fix header of jffs2_lzma_(de,)compress()] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 47790
Diffstat (limited to 'tools/mtd-utils/patches/137-no_extern_inline.patch')
-rw-r--r--tools/mtd-utils/patches/137-no_extern_inline.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/tools/mtd-utils/patches/137-no_extern_inline.patch b/tools/mtd-utils/patches/137-no_extern_inline.patch
deleted file mode 100644
index d871d670d2..0000000000
--- a/tools/mtd-utils/patches/137-no_extern_inline.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;