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

Comparing ray/src/common/standard.h (file contents):
Revision 2.22 by greg, Tue May 13 17:58:32 2003 UTC vs.
Revision 2.26 by schorsch, Sun Jun 8 12:03:09 2003 UTC

# Line 2 | Line 2
2   /*
3   *      Miscellaneous definitions required by many routines.
4   */
5 + #ifndef _RAD_STANDARD_H_
6 + #define _RAD_STANDARD_H_
7 + #ifdef __cplusplus
8 + extern "C" {
9 + #endif
10  
11   #include "copyright.h"
12  
13   #include  <stdio.h>
9
14   #include  <sys/types.h>
11
15   #include  <fcntl.h>
13
16   #include  <math.h>
15
17   #include  <errno.h>
17
18   #include  <stdlib.h>
19
19   #include  <string.h>
20  
21   #include  "mat4.h"
22 +
23 +
24 + #ifndef NULL
25 + #define NULL 0
26 + #endif
27 +
28                                  /* regular transformation */
29   typedef struct {
30          MAT4  xfm;                              /* transform matrix */
# Line 39 | Line 44 | typedef struct {
44   #endif
45   #endif
46  
47 + /* XXX include paths.h instead */
48   #ifndef  F_OK                   /* mode bits for access(2) call */
49   #define  R_OK           4               /* readable */
50   #define  W_OK           2               /* writable */
# Line 109 | Line 115 | extern double  tcos();                 /* table-based cosine approxim
115   #endif
116   extern off_t  lseek();
117  
118 < #ifdef MSDOS
118 > #ifdef _WIN32
119   #define NIX 1
120   #endif
121   #ifdef AMIGA
122   #define NIX 1
123   #endif
124  
119 #ifdef NOPROTO
125  
121 extern int      badarg();
122 extern char     *bmalloc();
123 extern void     bfree();
124 extern void     error();
125 extern int      expandarg();
126 extern time_t   fdate();
127 extern int      setfdate();
128 extern char     *fgetline();
129 extern int      fgetval();
130 extern char     *fgetword();
131 extern void     fputword();
132 extern char     *fixargv0();
133 extern FILE     *frlibopen();
134 extern char     *getrlibpath();
135 extern char     *getpath();
136 extern void     putstr();
137 extern void     putint();
138 extern void     putflt();
139 extern char     *getstr();
140 extern long     getint();
141 extern double   getflt();
142 extern int      open_process();
143 extern int      process();
144 extern int      close_process();
145 extern int      readbuf();
146 extern int      writebuf();
147 extern int      ecompile();
148 extern char     *expsave();
149 extern void     expset();
150 extern char     *eindex();
151 extern char     *savestr();
152 extern void     freestr();
153 extern int      shash();
154 extern char     *savqstr();
155 extern void     freeqstr();
156 extern double   tcos();
157 extern int      wordfile();
158 extern int      wordstring();
159 extern char     *atos();
160 extern char     *nextword();
161 extern char     *sskip();
162 extern char     *sskip2();
163 extern char     *iskip();
164 extern char     *fskip();
165 extern int      isint();
166 extern int      isintd();
167 extern int      isflt();
168 extern int      isfltd();
169 extern int      xf();
170 extern int      invxf();
171 extern int      fullxf();
172 extern int      quadtratic();
173 extern int4     encodedir();
174 extern void     decodedir();
175 extern double   dir2diff();
176 extern double   fdir2diff();
177 extern void     eputs();
178 extern void     wputs();
179 extern void     quit();
180
181 #else
126                                          /* defined in badarg.c */
127   extern int      badarg(int ac, char **av, char *fl);
128                                          /* defined in bmalloc.c */
# Line 260 | Line 204 | extern int4    encodedir(FVECT dv);
204   extern void     decodedir(FVECT dv, int4 dc);
205   extern double   dir2diff(int4 dc1, int4 dc2);
206   extern double   fdir2diff(int4 dc1, FVECT v2);
207 +                                        /* defined in lamp.c */
208 + extern float * matchlamp(char *s);
209 + extern int loadlamps(char *file);
210 + extern void freelamps(void);
211                                          /* miscellaneous */
212   extern void     eputs(char *s);
213   extern void     wputs(char *s);
214   extern void     quit(int code);
215  
216 +
217 + #ifdef __cplusplus
218 + }
219   #endif
220 + #endif /* _RAD_STANDARD_H_ */
221 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines