From 4382c76d1f225e462c6adf37e577fea0d046b854 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 7 Apr 2018 15:21:25 +0200 Subject: [PATCH] switch from typeof to the more portable __typeof__ MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Depending on the existance/lack of container_of define including libubox or uci headers (e.g. #include ) could result in compilation errors like: staging_dir/target-arm_cortex-a9_musl-1.1.16_eabi/usr/include/uci.h:643:10: error: expected declaration specifiers or '...' before '(' token return uci_to_package(e); staging_dir/target-arm_cortex-a9_musl-1.1.16_eabi/usr/include/uci.h:643:10: error: '__mptr' undeclared (first use in this function) return uci_to_package(e); Signed-off-by: Felix Fietkau [rmilecki: add commit description] Signed-off-by: Rafał Miłecki (cherry picked from commit ace64897d47b9bc7af277d8a3f8a0ff67976cba8) --- avl.h | 14 +++++++------- list.h | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/avl.h b/avl.h index c468597..1eb18ad 100644 --- a/avl.h +++ b/avl.h @@ -238,7 +238,7 @@ __avl_find_element(const struct avl_tree *tree, const void *key, size_t offset, * NULL if no element was found */ #define avl_find_element(tree, key, element, node_element) \ - ((typeof(*(element)) *)__avl_find_element(tree, key, offsetof(typeof(*(element)), node_element), AVL_FIND_EQUAL)) + ((__typeof__(*(element)) *)__avl_find_element(tree, key, offsetof(typeof(*(element)), node_element), AVL_FIND_EQUAL)) /** * @param tree pointer to avl-tree @@ -251,7 +251,7 @@ __avl_find_element(const struct avl_tree *tree, const void *key, size_t offset, * NULL if no element was found */ #define avl_find_le_element(tree, key, element, node_element) \ - ((typeof(*(element)) *)__avl_find_element(tree, key, offsetof(typeof(*(element)), node_element), AVL_FIND_LESSEQUAL)) + ((__typeof__(*(element)) *)__avl_find_element(tree, key, offsetof(typeof(*(element)), node_element), AVL_FIND_LESSEQUAL)) /** * @param tree pointer to avl-tree @@ -264,7 +264,7 @@ __avl_find_element(const struct avl_tree *tree, const void *key, size_t offset, * NULL if no element was found */ #define avl_find_ge_element(tree, key, element, node_element) \ - ((typeof(*(element)) *)__avl_find_element(tree, key, offsetof(typeof(*(element)), node_element), AVL_FIND_GREATEREQUAL)) + ((__typeof__(*(element)) *)__avl_find_element(tree, key, offsetof(typeof(*(element)), node_element), AVL_FIND_GREATEREQUAL)) /** * This function must not be called for an empty tree @@ -278,7 +278,7 @@ __avl_find_element(const struct avl_tree *tree, const void *key, size_t offset, * (automatically converted to type 'element') */ #define avl_first_element(tree, element, node_member) \ - container_of((tree)->list_head.next, typeof(*(element)), node_member.list) + container_of((tree)->list_head.next, __typeof__(*(element)), node_member.list) /** * @param tree pointer to tree @@ -290,7 +290,7 @@ __avl_find_element(const struct avl_tree *tree, const void *key, size_t offset, * (automatically converted to type 'element') */ #define avl_last_element(tree, element, node_member) \ - container_of((tree)->list_head.prev, typeof(*(element)), node_member.list) + container_of((tree)->list_head.prev, __typeof__(*(element)), node_member.list) /** * This function must not be called for the last element of @@ -303,7 +303,7 @@ __avl_find_element(const struct avl_tree *tree, const void *key, size_t offset, * (automatically converted to type 'element') */ #define avl_next_element(element, node_member) \ - container_of((&(element)->node_member.list)->next, typeof(*(element)), node_member.list) + container_of((&(element)->node_member.list)->next, __typeof__(*(element)), node_member.list) /** * This function must not be called for the first element of @@ -316,7 +316,7 @@ __avl_find_element(const struct avl_tree *tree, const void *key, size_t offset, * (automatically converted to type 'element') */ #define avl_prev_element(element, node_member) \ - container_of((&(element)->node_member.list)->prev, typeof(*(element)), node_member.list) + container_of((&(element)->node_member.list)->prev, __typeof__(*(element)), node_member.list) /** * Loop over a block of elements of a tree, used similar to a for() command. diff --git a/list.h b/list.h index ab52acf..8e61e47 100644 --- a/list.h +++ b/list.h @@ -37,7 +37,7 @@ #ifndef container_of #define container_of(ptr, type, member) \ ({ \ - const typeof(((type *) NULL)->member) *__mptr = (ptr); \ + const __typeof__(((type *) NULL)->member) *__mptr = (ptr); \ (type *) ((char *) __mptr - offsetof(type, member)); \ }) #endif @@ -120,17 +120,17 @@ list_del_init(struct list_head *entry) for (p = (head)->next, n = p->next; p != (head); p = n, n = p->next) #define list_for_each_entry(p, h, field) \ - for (p = list_first_entry(h, typeof(*p), field); &p->field != (h); \ - p = list_entry(p->field.next, typeof(*p), field)) + for (p = list_first_entry(h, __typeof__(*p), field); &p->field != (h); \ + p = list_entry(p->field.next, __typeof__(*p), field)) #define list_for_each_entry_safe(p, n, h, field) \ - for (p = list_first_entry(h, typeof(*p), field), \ - n = list_entry(p->field.next, typeof(*p), field); &p->field != (h);\ - p = n, n = list_entry(n->field.next, typeof(*n), field)) + for (p = list_first_entry(h, __typeof__(*p), field), \ + n = list_entry(p->field.next, __typeof__(*p), field); &p->field != (h);\ + p = n, n = list_entry(n->field.next, __typeof__(*n), field)) #define list_for_each_entry_reverse(p, h, field) \ - for (p = list_last_entry(h, typeof(*p), field); &p->field != (h); \ - p = list_entry(p->field.prev, typeof(*p), field)) + for (p = list_last_entry(h, __typeof__(*p), field); &p->field != (h); \ + p = list_entry(p->field.prev, __typeof__(*p), field)) #define list_for_each_prev(p, h) for (p = (h)->prev; p != (h); p = p->prev) #define list_for_each_prev_safe(p, n, h) for (p = (h)->prev, n = p->prev; p != (h); p = n, n = p->prev) -- 2.30.2