admin/mlib
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix broken mempool build due to prefix renaming!

Browse Source
This commit is contained in:
Patrick Pelissier committed 2017-08-20 09:40:10 +02:00
1 parent b50ca249d9
commit 6bdcc5860f
2 files changed
+12 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

m-list.h
+5 -5
View File
@@ -102,13 +102,13 @@
/* Define alloc functions. If MEMPOOL, we need to define it */ \ /* Define alloc functions. If MEMPOOL, we need to define it */ \
M_IF_METHOD(MEMPOOL, oplist)( \ M_IF_METHOD(MEMPOOL, oplist)( \
\ \
MEMPOOL_DEF(M_C(name, mempool_list), struct M_C(name, _s)) \ MEMPOOL_DEF(M_C(name, _mempool), struct M_C(name, _s)) \
M_GET_MEMPOOL_LINKAGE oplist M_C(name, mempool_list_t) M_GET_MEMPOOL oplist; \ M_GET_MEMPOOL_LINKAGE oplist M_C(name, _mempool_t) M_GET_MEMPOOL oplist; \
static inline struct M_C(name, _s) *M_C(name, _int_new)(void) { \ static inline struct M_C(name, _s) *M_C(name, _int_new)(void) { \
return M_C(name, mempool_list_alloc)(M_GET_MEMPOOL oplist); \ return M_C(name, _mempool_alloc)(M_GET_MEMPOOL oplist); \
} \ } \
static inline void M_C(name,_int_del)(struct M_C(name, _s) *ptr) { \ static inline void M_C(name,_int_del)(struct M_C(name, _s) *ptr) { \
M_C(name, mempool_list_free)(M_GET_MEMPOOL oplist, ptr); \ M_C(name, _mempool_free)(M_GET_MEMPOOL oplist, ptr); \
} \ } \
\ \
, /* No mempool allocation */ \ , /* No mempool allocation */ \
@@ -116,7 +116,7 @@
static inline struct M_C(name, _s) *M_C(name, _int_new)(void) { \ static inline struct M_C(name, _s) *M_C(name, _int_new)(void) { \
return M_GET_NEW oplist (struct M_C(name, _s)); \ return M_GET_NEW oplist (struct M_C(name, _s)); \
} \ } \
static inline void M_C(name,_int_del)(struct M_C(name, _s) *ptr) { \ static inline void M_C(name,_int_del)(struct M_C(name, _s) *ptr) { \
M_GET_DEL oplist (ptr); \ M_GET_DEL oplist (ptr); \
} \ } \
) \ ) \
m-rbtree.h
+7 -7
View File
@@ -144,15 +144,14 @@ typedef enum {
typedef type M_C(name, _type_t); \ typedef type M_C(name, _type_t); \
\ \
M_IF_METHOD(MEMPOOL, oplist)( \ M_IF_METHOD(MEMPOOL, oplist)( \
MEMPOOL_DEF(M_C(name, _mempool_rbtree), node_t) \ MEMPOOL_DEF(M_C(name, _mempool), node_t) \
M_GET_MEMPOOL_LINKAGE oplist M_C(name, mempool_rbtree_t) M_GET_MEMPOOL oplist; \ M_GET_MEMPOOL_LINKAGE oplist M_C(name, _mempool_t) M_GET_MEMPOOL oplist; \
static inline node_t *M_C(name,_int_new)(void) { \ static inline node_t *M_C(name,_int_new)(void) { \
return M_C(name, _mempool_rbtree_alloc)(M_GET_MEMPOOL oplist); \ return M_C(name, _mempool_alloc)(M_GET_MEMPOOL oplist); \
} \ } \
static inline void M_C(name,_int_del)(node_t *ptr) { \ static inline void M_C(name,_int_del)(node_t *ptr) { \
M_C(name, mempool_rbtree_free)(M_GET_MEMPOOL oplist, ptr); \ M_C(name, _mempool_free)(M_GET_MEMPOOL oplist, ptr); \
} \ } \
RBTREEI_DEF3(name, type, oplist, tree_t, node_t, tree_it_t) \
\ \
, /* No mempool allocation */ \ , /* No mempool allocation */ \
\ \
@@ -161,8 +160,9 @@ typedef enum {
} \ } \
static inline void M_C(name,_int_del)(node_t *ptr) { \ static inline void M_C(name,_int_del)(node_t *ptr) { \
M_GET_DEL oplist (ptr); \ M_GET_DEL oplist (ptr); \
} \ } ) \
RBTREEI_DEF3(name, type, oplist, tree_t, node_t, tree_it_t) ) \
RBTREEI_DEF3(name, type, oplist, tree_t, node_t, tree_it_t)
#define RBTREEI_DEF3(name, type, oplist, tree_t, node_t, tree_it_t) \ #define RBTREEI_DEF3(name, type, oplist, tree_t, node_t, tree_it_t) \
\ \