X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fhlist.h;h=e3b94ced234f61a721a52cef7a19fec543c63b5a;hp=9f7776fa7391f5093d431957b140aad98253b45c;hb=16aa9ee87cf4364921c36025359be01390338d87;hpb=06f22bdbb0c4c4d5db42a2e2dc35818aa61415be

diff --git a/urcu/hlist.h b/urcu/hlist.h
index 9f7776f..e3b94ce 100644
--- a/urcu/hlist.h
+++ b/urcu/hlist.h
@@ -16,41 +16,41 @@
  * published by the Free  Software Foundation.
  */
 
-struct hlist_head
+struct cds_hlist_head
 {
-	struct hlist_node *next;
+	struct cds_hlist_node *next;
 };
 
-struct hlist_node
+struct cds_hlist_node
 {
-	struct hlist_node *next;
-	struct hlist_node *prev;
+	struct cds_hlist_node *next;
+	struct cds_hlist_node *prev;
 };
 
 /* Initialize a new list head.  */
-static inline void  INIT_HLIST_HEAD(struct hlist_head *ptr)
+static inline void  CDS_INIT_HLIST_HEAD(struct cds_hlist_head *ptr)
 {
 	ptr->next = NULL;
 }
 
 /* Get typed element from list at a given position.  */
-#define hlist_entry(ptr, type, member)					\
+#define cds_hlist_entry(ptr, type, member)					\
 	((type *) ((char *) (ptr) - (unsigned long) (&((type *) 0)->member)))
 
 /* Add new element at the head of the list.  */
-static inline void hlist_add_head (struct hlist_node *newp,
-				   struct hlist_head *head)
+static inline void cds_hlist_add_head (struct cds_hlist_node *newp,
+				   struct cds_hlist_head *head)
 {
 	if (head->next)
 		head->next->prev = newp;
 
 	newp->next = head->next;
-	newp->prev = (struct hlist_node *)head;
+	newp->prev = (struct cds_hlist_node *)head;
 	head->next = newp;
 }
 
 /* Remove element from list.  */
-static inline void hlist_del (struct hlist_node *elem)
+static inline void cds_hlist_del (struct cds_hlist_node *elem)
 {
 	if (elem->next)
 		elem->next->prev = elem->prev;
@@ -58,18 +58,18 @@ static inline void hlist_del (struct hlist_node *elem)
 	elem->prev->next = elem->next;
 }
 
-#define hlist_for_each_entry(entry, pos, head, member)			\
+#define cds_hlist_for_each_entry(entry, pos, head, member)			\
 	for (pos = (head)->next,					\
-		     entry = hlist_entry(pos, typeof(*entry), member);	\
+		     entry = cds_hlist_entry(pos, typeof(*entry), member);	\
 	     pos != NULL;						\
 	     pos = pos->next,					\
-		     entry = hlist_entry(pos, typeof(*entry), member))
+		     entry = cds_hlist_entry(pos, typeof(*entry), member))
 
-#define hlist_for_each_entry_safe(entry, pos, p, head, member)		\
+#define cds_hlist_for_each_entry_safe(entry, pos, p, head, member)		\
 	for (pos = (head)->next,					\
-		     entry = hlist_entry(pos, typeof(*entry), member);	\
+		     entry = cds_hlist_entry(pos, typeof(*entry), member);	\
 	     (pos != NULL) && ({ p = pos->next; 1;});			\
 	     pos = p,							\
-		     entry = hlist_entry(pos, typeof(*entry), member))
+		     entry = cds_hlist_entry(pos, typeof(*entry), member))
 
 #endif	/* _KCOMPAT_HLIST_H */