diff options
Diffstat (limited to 'ccan')
| -rw-r--r-- | ccan/check_type/check_type.h | 2 | ||||
| -rw-r--r-- | ccan/container_of/container_of.h | 4 | ||||
| -rw-r--r-- | ccan/list/list.h | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/ccan/check_type/check_type.h b/ccan/check_type/check_type.h index e795ad71d0..659e1a5a83 100644 --- a/ccan/check_type/check_type.h +++ b/ccan/check_type/check_type.h @@ -44,7 +44,7 @@ * ((encl_type *) \ * ((char *)(mbr_ptr) - offsetof(enclosing_type, mbr)))) */ -#if HAVE_TYPEOF +#if defined(HAVE_TYPEOF) && HAVE_TYPEOF #define ccan_check_type(expr, type) \ ((typeof(expr) *)0 != (type *)0) diff --git a/ccan/container_of/container_of.h b/ccan/container_of/container_of.h index b30c347d57..872bb6ea6e 100644 --- a/ccan/container_of/container_of.h +++ b/ccan/container_of/container_of.h @@ -112,7 +112,7 @@ static inline char *container_of_or_null_(void *member_ptr, size_t offset) * return i; * } */ -#if HAVE_TYPEOF +#if defined(HAVE_TYPEOF) && HAVE_TYPEOF #define ccan_container_of_var(member_ptr, container_var, member) \ ccan_container_of(member_ptr, typeof(*container_var), member) #else @@ -131,7 +131,7 @@ static inline char *container_of_or_null_(void *member_ptr, size_t offset) * structure memory layout. * */ -#if HAVE_TYPEOF +#if defined(HAVE_TYPEOF) && HAVE_TYPEOF #define ccan_container_off_var(var, member) \ ccan_container_off(typeof(*var), member) #else diff --git a/ccan/list/list.h b/ccan/list/list.h index 91787bfdb3..bf692a6937 100644 --- a/ccan/list/list.h +++ b/ccan/list/list.h @@ -635,14 +635,16 @@ static inline void ccan_list_prepend_list_(struct ccan_list_head *to, /* internal macros, do not use directly */ #define ccan_list_for_each_off_dir_(h, i, off, dir) \ - for (i = ccan_list_node_to_off_(ccan_list_debug(h, CCAN_LIST_LOC)->n.dir, \ + for (i = 0, \ + i = ccan_list_node_to_off_(ccan_list_debug(h, CCAN_LIST_LOC)->n.dir, \ (off)); \ ccan_list_node_from_off_((void *)i, (off)) != &(h)->n; \ i = ccan_list_node_to_off_(ccan_list_node_from_off_((void *)i, (off))->dir, \ (off))) #define ccan_list_for_each_safe_off_dir_(h, i, nxt, off, dir) \ - for (i = ccan_list_node_to_off_(ccan_list_debug(h, CCAN_LIST_LOC)->n.dir, \ + for (i = 0, \ + i = ccan_list_node_to_off_(ccan_list_debug(h, CCAN_LIST_LOC)->n.dir, \ (off)), \ nxt = ccan_list_node_to_off_(ccan_list_node_from_off_(i, (off))->dir, \ (off)); \ @@ -770,7 +772,7 @@ static inline struct ccan_list_node *ccan_list_node_from_off_(void *ptr, size_t (ccan_container_off_var(var, member) + \ ccan_check_type(var->member, struct ccan_list_node)) -#if HAVE_TYPEOF +#if defined(HAVE_TYPEOF) && HAVE_TYPEOF #define ccan_list_typeof(var) typeof(var) #else #define ccan_list_typeof(var) void * |