--- xllist.c.orig	Thu Dec 23 17:03:26 1999
+++ xllist.c	Thu Dec 23 17:02:50 1999
@@ -991,7 +991,7 @@
 }
 
 /* xsort - built-in function 'sort' */
-LOCAL LVAL mergesort P3C(LVAL, list, LVAL, sortfcn, LVAL, sortkey)
+LOCAL LVAL xl_mergesort P3C(LVAL, list, LVAL, sortfcn, LVAL, sortkey)
 {
   /* Strategy: divide into two parts, (recurse) to sort each, then
      merge them together */
@@ -1018,8 +1018,8 @@
     rplacd(temp, NIL);		/* split left and right parts */
   }
 
-  left = mergesort(left, sortfcn, sortkey);
-  right = mergesort(right, sortfcn, sortkey);
+  left = xl_mergesort(left, sortfcn, sortkey);
+  right = xl_mergesort(right, sortfcn, sortkey);
 
   {
     LVAL result, resultt = NULL, leftarg, rightarg;
@@ -1094,12 +1094,12 @@
     {
       LVAL etype = gettvecetype(list);
       list = coerce_to_list(list);
-      list = mergesort(list, sortfcn, sortkey);
+      list = xl_mergesort(list, sortfcn, sortkey);
       list = coerce_to_tvec(list, etype);
       break;
     }
   case CONS:
-    list = mergesort(list, sortfcn, sortkey);
+    list = xl_mergesort(list, sortfcn, sortkey);
     break;
   default: xlbadtype(list);
   }
