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.25 by schorsch, Sat Jun 7 12:50:20 2003 UTC vs.
Revision 2.27 by greg, Fri Jun 20 00:25:49 2003 UTC

# Line 18 | Line 18 | extern "C" {
18   #include  <stdlib.h>
19   #include  <string.h>
20  
21 < #include  "platform.h"
21 > #include  "tifftypes.h"
22 >
23   #include  "mat4.h"
24  
24 –
25 – #ifndef NULL
26 – #define NULL 0
27 – #endif
28 –
25                                  /* regular transformation */
26   typedef struct {
27          MAT4  xfm;                              /* transform matrix */
# Line 45 | Line 41 | typedef struct {
41   #endif
42   #endif
43  
44 + /* XXX include paths.h instead */
45   #ifndef  F_OK                   /* mode bits for access(2) call */
46   #define  R_OK           4               /* readable */
47   #define  W_OK           2               /* writable */
# Line 52 | Line 49 | typedef struct {
49   #define  F_OK           0               /* exists */
50   #endif
51  
55 – #ifndef  int2
56 – #define  int2           short           /* two-byte integer */
57 – #endif
58 – #ifndef  int4
59 – #define  int4           int             /* four-byte integer */
60 – #endif
61 –
52                                  /* error codes */
53   #define  WARNING        0               /* non-fatal error */
54   #define  USER           1               /* fatal user-caused error */
# Line 115 | Line 105 | extern double  tcos();                 /* table-based cosine approxim
105   #endif
106   extern off_t  lseek();
107  
108 < #ifdef MSDOS
108 > #ifdef _WIN32
109   #define NIX 1
110   #endif
111   #ifdef AMIGA
# Line 200 | Line 190 | extern int     fullxf(FULLXF *fx, int ac, char *av[]);
190                                          /* defined in zeroes.c */
191   extern int      quadtratic(double *r, double a, double b, double c);
192                                          /* defined in dircode.c */
193 < extern int4     encodedir(FVECT dv);
194 < extern void     decodedir(FVECT dv, int4 dc);
195 < extern double   dir2diff(int4 dc1, int4 dc2);
196 < extern double   fdir2diff(int4 dc1, FVECT v2);
193 > extern int32    encodedir(FVECT dv);
194 > extern void     decodedir(FVECT dv, int32 dc);
195 > extern double   dir2diff(int32 dc1, int32 dc2);
196 > extern double   fdir2diff(int32 dc1, FVECT v2);
197 >                                        /* defined in lamp.c */
198 > extern float * matchlamp(char *s);
199 > extern int loadlamps(char *file);
200 > extern void freelamps(void);
201                                          /* miscellaneous */
202   extern void     eputs(char *s);
203   extern void     wputs(char *s);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines