X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Flist.h;h=1d1c7b5ce2882b6bd0e13b53b096c081dbcb1b44;hp=04dad80929ef1d6f2ec1a3adcd302d8f2f962533;hb=e323ceac1f453085192d53689870f378d897426e;hpb=bce63dfd0a2306452c9e39f5df01789e77f3f44a

diff --git a/urcu/list.h b/urcu/list.h
index 04dad80..1d1c7b5 100644
--- a/urcu/list.h
+++ b/urcu/list.h
@@ -140,12 +140,17 @@ cds_list_splice (struct cds_list_head *add, struct cds_list_head *head)
 #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) \
@@ -154,20 +159,20 @@ cds_list_splice (struct cds_list_head *add, 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)
 {