ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/meta/meta.h
(Generate patch)

Comparing ray/src/meta/meta.h (file contents):
Revision 1.2 by schorsch, Sun Jun 8 12:03:10 2003 UTC vs.
Revision 1.6 by schorsch, Mon Jul 14 22:24:00 2003 UTC

# Line 4 | Line 4
4   */
5   #ifndef _RAD_META_H_
6   #define _RAD_META_H_
7 – #ifdef __cplusplus
8 – extern "C" {
9 – #endif
7  
8   #include "copyright.h"
9  
10   #include  <stdio.h>
11   #include  <stdlib.h>
15 – #include  <malloc.h>
16 –
12   #include  <ctype.h>
13  
14 + #include  "rterror.h"
15  
16 + #ifdef __cplusplus
17 + extern "C" {
18 + #endif
19 +
20   #define  TRUE  1
21   #define  FALSE  0
22  
23   #define  PEOF  'F'              /* end of file global */
24   #define  PEOP  'E'              /* end of page global */
25 < #define  PPAUSE  'P'            /* pause global */
25 > #define  PPAUS  'P'             /* pause global */
26   #define  PDRAW  'D'             /* draw global */
27   #define  POPEN  'O'             /* open segment */
28   #define  PCLOSE  'C'            /* close segment */
# Line 54 | Line 54 | extern "C" {
54   #define  SPAT2  06              /* set pattern 2 */
55   #define  SPAT3  07              /* set pattern 3 */
56  
57 – #define  SYSTEM  0              /* system error, internal, fatal */
58 – #define  USER  1                /* user error, fatal */
59 – #define  WARNING  2             /* user error, not fatal */
60 –
57   #ifdef  UNIX
58   #define  TDIR  "/tmp/"          /* directory for temporary files */
59   #ifndef  MDIR
# Line 153 | Line 149 | extern void pfree(register PRIMITIVE *p);
149   extern void plfree(register PLIST *pl);
150          /* sort.c */
151   extern void sort(FILE *infp, int (*pcmp)());
152 < extern void mergesort(FILE *fi[], int nf, PLIST *pl, int (*pcmp)(), FILE *ofp);
152 > extern void pmergesort(FILE *fi[], int nf, PLIST *pl, int (*pcmp)(), FILE *ofp);
153          /* metacalls.c */
154   extern void mdraw(int x, int y);
155   extern void msegment(int xmin, int ymin, int xmax, int ymax, char *sname,

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)