X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Flist.h;h=1d1c7b5ce2882b6bd0e13b53b096c081dbcb1b44;hb=5e338f70a9e0bef4085a4494b377d51919eb6343;hp=bb50128e56e4de7d57df313672f012d9077f3573;hpb=4b7cab77f3c1c03f021cb0f7e8d150eed3f948e9;p=urcu.git

diff --git a/urcu/list.h b/urcu/list.h
index bb50128..1d1c7b5 100644
--- a/urcu/list.h
+++ b/urcu/list.h
@@ -37,6 +37,7 @@ struct cds_list_head
   struct cds_list_head *prev;
 };
 
+
 /* Define a variable with the head and tail of the list.  */
 #define CDS_LIST_HEAD(name) \
   struct cds_list_head name = { &(name), &(name) }
@@ -125,33 +126,31 @@ cds_list_splice (struct cds_list_head *add, struct cds_list_head *head)
     }
 }
 
-/* Returns 1 if list is empty, 0 otherwise */
-static inline
-int cds_list_empty(struct cds_list_head *head)
-{
-	return head->next == head->prev;
-}
-
 /* Get typed element from list at a given position.  */
 #define cds_list_entry(ptr, type, member) \
   ((type *) ((char *) (ptr) - (unsigned long) (&((type *) 0)->member)))
 
 
 /* Get first entry from a list. */
-#define cds_list_first_entry(head, type, member) \
-	cds_list_entry((head)->next, type, member)
+#define cds_list_first_entry(ptr, type, member) \
+	cds_list_entry((ptr)->next, type, member)
 
 
 /* Iterate forward over the elements of the list.  */
 #define cds_list_for_each(pos, head) \
   for (pos = (head)->next; pos != (head); pos = pos->next)
 
+/* Iterate forward over the elements list. The list elements can be
+   removed from the list while doing this.  */
+#define cds_list_for_each_safe(pos, p, head) \
+  for (pos = (head)->next, p = pos->next; \
+       pos != (head); \
+       pos = p, p = pos->next)
 
-/* Iterate forward over the elements of the list.  */
+/* Iterate backward over the elements of the list.  */
 #define cds_list_for_each_prev(pos, head) \
   for (pos = (head)->prev; pos != (head); pos = pos->prev)
 
-
 /* Iterate backwards over the elements list.  The list elements can be
    removed from the list while doing this.  */
 #define cds_list_for_each_prev_safe(pos, p, head) \
@@ -160,20 +159,20 @@ int cds_list_empty(struct cds_list_head *head)
        pos = p, p = pos->prev)
 
 #define cds_list_for_each_entry(pos, head, member)				\
-	for (pos = cds_list_entry((head)->next, typeof(*pos), member);	\
+	for (pos = cds_list_entry((head)->next, __typeof__(*pos), member); \
 	     &pos->member != (head);					\
-	     pos = cds_list_entry(pos->member.next, typeof(*pos), member))
+	     pos = cds_list_entry(pos->member.next, __typeof__(*pos), member))
 
 #define cds_list_for_each_entry_reverse(pos, head, member)			\
-	for (pos = cds_list_entry((head)->prev, typeof(*pos), member);	\
+	for (pos = cds_list_entry((head)->prev, __typeof__(*pos), member); \
 	     &pos->member != (head);					\
-	     pos = cds_list_entry(pos->member.prev, typeof(*pos), member))
+	     pos = cds_list_entry(pos->member.prev, __typeof__(*pos), member))
 
 #define cds_list_for_each_entry_safe(pos, p, head, member)			\
-	for (pos = cds_list_entry((head)->next, typeof(*pos), member),	\
-		     p = cds_list_entry(pos->member.next,typeof(*pos), member); \
+	for (pos = cds_list_entry((head)->next, __typeof__(*pos), member), \
+		     p = cds_list_entry(pos->member.next, __typeof__(*pos), member); \
 	     &pos->member != (head);					\
-	     pos = p, p = cds_list_entry(pos->member.next, typeof(*pos), member))
+	     pos = p, p = cds_list_entry(pos->member.next, __typeof__(*pos), member))
 
 static inline int cds_list_empty(struct cds_list_head *head)
 {