--- ray/src/meta/meta.h	2003/06/08 12:03:10	1.2
+++ ray/src/meta/meta.h	2003/08/01 14:14:24	1.7
@@ -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.7 2003/08/01 14:14:24 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,11 +54,12 @@ 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
+#ifdef  _WIN32  /* XXX */
+#define MDIR "c\\tmp\\" /* XXX we just need something to compile for now */
+#define TTY "CON:"   /* XXX this probably doesn't work */
+#else  /* XXX */
+
 #define  TDIR  "/tmp/"		/* directory for temporary files */
 #ifndef  MDIR
 #define  MDIR  "/usr/local/lib/meta/"	/* directory for metafiles */
@@ -66,23 +67,6 @@ extern "C" {
 #define  TTY  "/dev/tty"	/* console name */
 #endif
 
-#ifdef  MAC
-#define  TDIR  "5:tmp/"		/* directory for temporary files */
-#define  MDIR  "/meta/"		/* directory for metafiles */
-#define  TTY  ".con"		/* console name */
-#endif
-
-#ifdef  CPM
-#define  TDIR  "0/"		/* directory for temporary files */
-#define  MDIR  "0/"		/* directory for metafiles */
-#define  TTY  "CON:"		/* console name */
-#endif
-
-#ifdef  _WIN32  /* XXX */
-#define MDIR "c\\tmp\\" /* XXX we just need something to compile for now */
-#define TTY "CON:"   /* XXX this probably doesn't work */
-#endif  /* XXX */
-
 #define  MAXFNAME  64		/* maximum file name length */
 
 #define  XYSIZE  (1<<14)	/* metafile coordinate size */
@@ -153,7 +137,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,