X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fhlist.h;h=462f4937363fa0c137ae8603531ec23399ec7d10;hp=9f4332ac87d9afd33e48e5de6dcd3c4a96d5da88;hb=db903109f0031c831e8fdc95cb7197996e53f46d;hpb=d7a0f2fe29db52a5dff734a922ac33654f865836

diff --git a/urcu/hlist.h b/urcu/hlist.h
index 9f4332a..462f493 100644
--- a/urcu/hlist.h
+++ b/urcu/hlist.h
@@ -93,14 +93,18 @@ void cds_hlist_del(struct cds_hlist_node *elem)
 			entry = cds_hlist_entry(pos, __typeof__(*entry), member))
 
 #define cds_hlist_for_each_entry_2(entry, head, member) \
-	for (entry = cds_hlist_entry((head)->next, __typeof__(*entry), member); \
-		&entry->member != NULL; \
-		entry = cds_hlist_entry(entry->member.next, __typeof__(*entry), member))
+	for (entry = ((head)->next == NULL ? NULL \
+			: cds_hlist_entry((head)->next, __typeof__(*entry), member)); \
+		entry != NULL; \
+		entry = (entry->member.next == NULL ? NULL \
+			: cds_hlist_entry(entry->member.next, __typeof__(*entry), member)))
 
 #define cds_hlist_for_each_entry_safe_2(entry, e, head, member) \
-	for (entry = cds_hlist_entry((head)->next, __typeof__(*entry), member); \
-		(&entry->member != NULL) && (e = cds_hlist_entry(entry->member.next, \
-						__typeof__(*entry), member), 1); \
+	for (entry = ((head)->next == NULL ? NULL \
+			: cds_hlist_entry((head)->next, __typeof__(*entry), member)); \
+		(entry != NULL) && (e = (entry->member.next == NULL ? NULL \
+					: cds_hlist_entry(entry->member.next, \
+						__typeof__(*entry), member), 1)); \
 		entry = e)
 
 #endif	/* _KCOMPAT_HLIST_H */