From: Abramo Bagnara <abramo@alsa-project.org>
Date: Thu, 29 Mar 2001 14:39:02 +0000 (+0000)
Subject: Avoid use of C++ keywords
X-Git-Tag: v1.0.3~901
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=ce8275b943001a1dd8e3264f0cad11ca9e3cf2bb;p=alsa-lib.git

Avoid use of C++ keywords
---

diff --git a/include/list.h b/include/list.h
index 65c81422..5b3f1bf0 100644
--- a/include/list.h
+++ b/include/list.h
@@ -36,14 +36,14 @@ struct list_head {
  * This is only for internal list manipulation where we know
  * the prev/next entries already!
  */
-static __inline__ void __list_add(struct list_head * new,
-	struct list_head * prev,
-	struct list_head * next)
+static __inline__ void __list_add(struct list_head * _new,
+				  struct list_head * prev,
+				  struct list_head * next)
 {
-	next->prev = new;
-	new->next = next;
-	new->prev = prev;
-	prev->next = new;
+	next->prev = _new;
+	_new->next = next;
+	_new->prev = prev;
+	prev->next = _new;
 }
 
 /**
@@ -54,9 +54,9 @@ static __inline__ void __list_add(struct list_head * new,
  * Insert a new entry after the specified head.
  * This is good for implementing stacks.
  */
-static __inline__ void list_add(struct list_head *new, struct list_head *head)
+static __inline__ void list_add(struct list_head *_new, struct list_head *head)
 {
-	__list_add(new, head, head->next);
+	__list_add(_new, head, head->next);
 }
 
 /**
@@ -67,9 +67,9 @@ static __inline__ void list_add(struct list_head *new, struct list_head *head)
  * Insert a new entry before the specified head.
  * This is useful for implementing queues.
  */
-static __inline__ void list_add_tail(struct list_head *new, struct list_head *head)
+static __inline__ void list_add_tail(struct list_head *_new, struct list_head *head)
 {
-	__list_add(new, head->prev, head);
+	__list_add(_new, head->prev, head);
 }
 
 /*