ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/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.7 by schorsch, Fri Aug 1 14:14:24 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 */
57  
58 < #ifdef  UNIX
58 > #ifdef  _WIN32  /* XXX */
59 > #define MDIR "c\\tmp\\" /* XXX we just need something to compile for now */
60 > #define TTY "CON:"   /* XXX this probably doesn't work */
61 > #else  /* XXX */
62 >
63   #define  TDIR  "/tmp/"          /* directory for temporary files */
64   #ifndef  MDIR
65   #define  MDIR  "/usr/local/lib/meta/"   /* directory for metafiles */
# Line 66 | Line 67 | extern "C" {
67   #define  TTY  "/dev/tty"        /* console name */
68   #endif
69  
69 #ifdef  MAC
70 #define  TDIR  "5:tmp/"         /* directory for temporary files */
71 #define  MDIR  "/meta/"         /* directory for metafiles */
72 #define  TTY  ".con"            /* console name */
73 #endif
74
75 #ifdef  CPM
76 #define  TDIR  "0/"             /* directory for temporary files */
77 #define  MDIR  "0/"             /* directory for metafiles */
78 #define  TTY  "CON:"            /* console name */
79 #endif
80
81 #ifdef  _WIN32  /* XXX */
82 #define MDIR "c\\tmp\\" /* XXX we just need something to compile for now */
83 #define TTY "CON:"   /* XXX this probably doesn't work */
84 #endif  /* XXX */
85
70   #define  MAXFNAME  64           /* maximum file name length */
71  
72   #define  XYSIZE  (1<<14)        /* metafile coordinate size */
# Line 153 | Line 137 | extern void pfree(register PRIMITIVE *p);
137   extern void plfree(register PLIST *pl);
138          /* sort.c */
139   extern void sort(FILE *infp, int (*pcmp)());
140 < extern void mergesort(FILE *fi[], int nf, PLIST *pl, int (*pcmp)(), FILE *ofp);
140 > extern void pmergesort(FILE *fi[], int nf, PLIST *pl, int (*pcmp)(), FILE *ofp);
141          /* metacalls.c */
142   extern void mdraw(int x, int y);
143   extern void msegment(int xmin, int ymin, int xmax, int ymax, char *sname,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines