--- ray/src/meta/meta.h	2003/06/08 12:03:10	1.2
+++ ray/src/meta/meta.h	2003/06/16 14:54:54	1.3
@@ -1,4 +1,4 @@
-/* RCSid: $Id: meta.h,v 1.2 2003/06/08 12:03:10 schorsch Exp $ */
+/* RCSid: $Id: meta.h,v 1.3 2003/06/16 14:54:54 greg Exp $ */
 /*
  *   Standard meta-file definitions and limits
  */
@@ -12,7 +12,6 @@ extern "C" {
 
 #include  <stdio.h>
 #include  <stdlib.h>
-#include  <malloc.h>
 
 #include  <ctype.h>
 
@@ -153,7 +152,7 @@ extern void pfree(register PRIMITIVE *p);
 extern void plfree(register PLIST *pl);
 	/* sort.c */
 extern void sort(FILE *infp, int (*pcmp)());
-extern void mergesort(FILE *fi[], int nf, PLIST *pl, int (*pcmp)(), FILE *ofp);
+extern void pmergesort(FILE *fi[], int nf, PLIST *pl, int (*pcmp)(), FILE *ofp);
 	/* metacalls.c */
 extern void mdraw(int x, int y);
 extern void msegment(int xmin, int ymin, int xmax, int ymax, char *sname,