[asterisk-commits] trunk r17130 - in /trunk: channel.c include/asterisk/channel.h

[asterisk-commits at lists.digium.com]

Author: mogorman
Date: Mon Apr  3 14:42:26 2006
New Revision: 17130

URL: http://svn.digium.com/view/asterisk?rev=17130&view=rev
Log:
list word cant be used with g++ and causes problems
with h323.  patch from bug 6446, renames list to chan_list

Modified:
    trunk/channel.c
    trunk/include/asterisk/channel.h

Modified: trunk/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/channel.c?rev=17130&r1=17129&r2=17130&view=diff
==============================================================================
--- trunk/channel.c (original)
+++ trunk/channel.c Mon Apr  3 14:42:26 2006
@@ -333,7 +333,7 @@
 	shutting_down = 1;
 	if (hangup) {
 		AST_LIST_LOCK(&channels);
-		AST_LIST_TRAVERSE(&channels, c, list)
+		AST_LIST_TRAVERSE(&channels, c, chan_list)
 			ast_softhangup(c, AST_SOFTHANGUP_SHUTDOWN);
 		AST_LIST_UNLOCK(&channels);
 	}
@@ -345,7 +345,7 @@
 	struct ast_channel *c;
 	int cnt = 0;
 	AST_LIST_LOCK(&channels);
-	AST_LIST_TRAVERSE(&channels, c, list)
+	AST_LIST_TRAVERSE(&channels, c, chan_list)
 		cnt++;
 	AST_LIST_UNLOCK(&channels);
 	return cnt;
@@ -682,7 +682,7 @@
 	tmp->tech = &null_tech;
 
 	AST_LIST_LOCK(&channels);
-	AST_LIST_INSERT_HEAD(&channels, tmp, list);
+	AST_LIST_INSERT_HEAD(&channels, tmp, chan_list);
 	AST_LIST_UNLOCK(&channels);
 	return tmp;
 }
@@ -816,7 +816,7 @@
 
 	for (retries = 0; retries < 10; retries++) {
 		AST_LIST_LOCK(&channels);
-		AST_LIST_TRAVERSE(&channels, c, list) {
+		AST_LIST_TRAVERSE(&channels, c, chan_list) {
 			if (!prev) {
 				/* want head of list */
 				if (!name && !exten)
@@ -845,7 +845,7 @@
 						break;
 				}
 			} else if (c == prev) { /* found, return c->next */
-				c = AST_LIST_NEXT(c, list);
+				c = AST_LIST_NEXT(c, chan_list);
 				break;
 			}
 		}
@@ -952,7 +952,7 @@
 	headp=&chan->varshead;
 	
 	AST_LIST_LOCK(&channels);
-	AST_LIST_REMOVE(&channels, chan, list);
+	AST_LIST_REMOVE(&channels, chan, chan_list);
 	/* Lock and unlock the channel just to be sure nobody
 	   has it locked still */
 	ast_mutex_lock(&chan->lock);

Modified: trunk/include/asterisk/channel.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/channel.h?rev=17130&r1=17129&r2=17130&view=diff
==============================================================================
--- trunk/include/asterisk/channel.h (original)
+++ trunk/include/asterisk/channel.h Mon Apr  3 14:42:26 2006
@@ -424,7 +424,7 @@
 	struct ast_channel_spy_list *spies;
 
 	/*! For easy linking */
-	AST_LIST_ENTRY(ast_channel) list;
+	AST_LIST_ENTRY(ast_channel) chan_list;
 };
 
 /* \defgroup chanprop Channel tech properties: