--- mysql-4.1.13/include/my_list.h.~1~	2005-08-01 17:10:33.000000000 -0700
+++ mysql-4.1.13/include/my_list.h	2005-08-01 17:10:51.000000000 -0700
@@ -36,7 +36,7 @@
 extern unsigned int list_length(LIST *);
 extern int list_walk(LIST *,list_walk_action action,gptr argument);
 
-#define rest(a) ((a)->next)
+#define list_rest(a) ((a)->next)
 #define list_push(a,b) (a)=list_cons((b),(a))
 #define list_pop(A) {LIST *old=(A); (A)=list_delete(old,old) ; my_free((gptr) old,MYF(MY_FAE)); }
 
--- mysql-4.1.13/mysys/list.c.~1~	2005-08-01 17:11:56.000000000 -0700
+++ mysql-4.1.13/mysys/list.c	2005-08-01 17:12:11.000000000 -0700
@@ -109,7 +109,7 @@
   {
     if ((error = (*action)(list->data,argument)))
       return error;
-    list=rest(list);
+    list=list_rest(list);
   }
   return 0;
 }
--- mysql-4.1.13/mysys/thr_lock.c.~1~	2005-08-01 17:15:31.000000000 -0700
+++ mysql-4.1.13/mysys/thr_lock.c	2005-08-01 17:15:46.000000000 -0700
@@ -1124,7 +1124,7 @@
 
   pthread_mutex_lock(&THR_LOCK_lock);
   puts("Current locks:");
-  for (list=thr_lock_thread_list ; list && count++ < MAX_THREADS ; list=rest(list))
+  for (list=thr_lock_thread_list ; list && count++ < MAX_THREADS ; list=list_rest(list))
   {
     THR_LOCK *lock=(THR_LOCK*) list->data;
     VOID(pthread_mutex_lock(&lock->mutex));
--- mysql-4.1.13/libmysqld/sql_test.cc.~1~	2005-08-01 17:19:20.000000000 -0700
+++ mysql-4.1.13/libmysqld/sql_test.cc	2005-08-01 17:19:38.000000000 -0700
@@ -271,7 +271,7 @@
 
   VOID(my_init_dynamic_array(&saved_table_locks,sizeof(TABLE_LOCK_INFO),open_cache.records + 20,50));
   VOID(pthread_mutex_lock(&THR_LOCK_lock));
-  for (list=thr_lock_thread_list ; list ; list=rest(list))
+  for (list=thr_lock_thread_list ; list ; list=list_rest(list))
   {
     THR_LOCK *lock=(THR_LOCK*) list->data;
 
--- mysql-4.1.13/sql/sql_test.cc.~1~	2005-08-01 17:20:14.000000000 -0700
+++ mysql-4.1.13/sql/sql_test.cc	2005-08-01 17:20:35.000000000 -0700
@@ -271,7 +271,7 @@
 
   VOID(my_init_dynamic_array(&saved_table_locks,sizeof(TABLE_LOCK_INFO),open_cache.records + 20,50));
   VOID(pthread_mutex_lock(&THR_LOCK_lock));
-  for (list=thr_lock_thread_list ; list ; list=rest(list))
+  for (list=thr_lock_thread_list ; list ; list=list_rest(list))
   {
     THR_LOCK *lock=(THR_LOCK*) list->data;