Index: channel.c
===================================================================
--- channel.c	(revision 9274)
+++ channel.c	(working copy)
@@ -317,7 +317,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);
 	}
@@ -329,7 +329,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;
@@ -669,7 +669,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;
 }
@@ -804,7 +804,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)
@@ -833,7 +833,7 @@
 						break;
 				}
 			} else if (c == prev) { /* found, return c->next */
-				c = AST_LIST_NEXT(c, list);
+				c = AST_LIST_NEXT(c, chan_list);
 				break;
 			}
 		}
@@ -940,7 +940,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);
Index: include/asterisk/channel.h
===================================================================
--- include/asterisk/channel.h	(revision 9274)
+++ include/asterisk/channel.h	(working copy)
@@ -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: