From 40dcafaf80a29c20d74594853a8ff04441eabd9c Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Sat, 2 Aug 2014 16:22:31 +0200 Subject: Add and use RTEMS_CONTAINER_OF() --- cpukit/sapi/include/rtems/rbheap.h | 2 +- cpukit/sapi/include/rtems/rbtree.h | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'cpukit/sapi') diff --git a/cpukit/sapi/include/rtems/rbheap.h b/cpukit/sapi/include/rtems/rbheap.h index 7c44f11e72..0848b69eb7 100644 --- a/cpukit/sapi/include/rtems/rbheap.h +++ b/cpukit/sapi/include/rtems/rbheap.h @@ -254,7 +254,7 @@ void rtems_rbheap_extend_descriptors_with_malloc( /* Private API */ #define rtems_rbheap_chunk_of_node(node) \ - rtems_rbtree_container_of(node, rtems_rbheap_chunk, tree_node) + RTEMS_CONTAINER_OF(node, rtems_rbheap_chunk, tree_node) static inline bool rtems_rbheap_is_chunk_free(const rtems_rbheap_chunk *chunk) { diff --git a/cpukit/sapi/include/rtems/rbtree.h b/cpukit/sapi/include/rtems/rbtree.h index 4e6d852812..eaf2b6e8d5 100644 --- a/cpukit/sapi/include/rtems/rbtree.h +++ b/cpukit/sapi/include/rtems/rbtree.h @@ -73,16 +73,6 @@ typedef RBTree_Compare rtems_rbtree_compare; #define RTEMS_RBTREE_DEFINE_EMPTY(name) \ RBTREE_DEFINE_EMPTY(name) -/** - * @brief macro to return the structure containing the @a node. - * - * This macro returns a pointer of type @a object_type that points - * to the structure containing @a node, where @a object_member is the - * field name of the rtems_rbtree_node structure in objects of @a object_type. - */ -#define rtems_rbtree_container_of(node,object_type, object_member) \ - _RBTree_Container_of(node,object_type,object_member) - /** * @brief Initialize a RBTree header. * -- cgit v1.2.3