--- ray/src/meta/meta.h	2003/06/08 12:03:10	1.2
+++ ray/src/meta/meta.h	2003/07/14 22:24:00	1.6
@@ -1,28 +1,28 @@
-/* RCSid: $Id: meta.h,v 1.2 2003/06/08 12:03:10 schorsch Exp $ */
+/* RCSid: $Id: meta.h,v 1.6 2003/07/14 22:24:00 schorsch Exp $ */
 /*
  *   Standard meta-file definitions and limits
  */
 #ifndef _RAD_META_H_
 #define _RAD_META_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #include "copyright.h"
 
 #include  <stdio.h>
 #include  <stdlib.h>
-#include  <malloc.h>
-
 #include  <ctype.h>
 
+#include  "rterror.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define  TRUE  1
 #define  FALSE  0
 
 #define  PEOF  'F'		/* end of file global */
 #define  PEOP  'E'		/* end of page global */
-#define  PPAUSE  'P'		/* pause global */
+#define  PPAUS  'P'		/* pause global */
 #define  PDRAW  'D'		/* draw global */
 #define  POPEN  'O'		/* open segment */
 #define  PCLOSE  'C'		/* close segment */
@@ -54,10 +54,6 @@ extern "C" {
 #define  SPAT2  06		/* set pattern 2 */
 #define  SPAT3  07		/* set pattern 3 */
 
-#define  SYSTEM	 0		/* system error, internal, fatal */
-#define  USER  1		/* user error, fatal */
-#define  WARNING  2		/* user error, not fatal */
-
 #ifdef  UNIX
 #define  TDIR  "/tmp/"		/* directory for temporary files */
 #ifndef  MDIR
@@ -153,7 +149,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,