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

Comparing src/common/standard.h (file contents):
Revision 2.25 by schorsch, Sat Jun 7 12:50:20 2003 UTC vs.
Revision 2.29 by greg, Sat Jun 21 14:48:54 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 88 | Line 78 | extern char  errmsg[];                 /* global buffer for error me
78   #define  tsin                   sin
79   #define  ttan                   tan
80   #else
81 < extern double   tcos();                 /* table-based cosine approximation */
81 >                                        /* table-based cosine approximation */
82   #define  tsin(x)                tcos((x)-(PI/2.))
83   #define  ttan(x)                (tsin(x)/tcos(x))
84   #endif
# Line 113 | Line 103 | extern double  tcos();                 /* table-based cosine approxim
103   #define  index                  strchr
104   #define  rindex                 strrchr
105   #endif
116 – extern off_t  lseek();
106  
107 < #ifdef MSDOS
107 >                        /* <unistd.h> is missing on some systems */
108 > extern off_t  lseek(int, off_t, int);
109 >
110 > #ifdef _WIN32
111   #define NIX 1
112   #endif
113   #ifdef AMIGA
# Line 200 | Line 192 | extern int     fullxf(FULLXF *fx, int ac, char *av[]);
192                                          /* defined in zeroes.c */
193   extern int      quadtratic(double *r, double a, double b, double c);
194                                          /* defined in dircode.c */
195 < extern int4     encodedir(FVECT dv);
196 < extern void     decodedir(FVECT dv, int4 dc);
197 < extern double   dir2diff(int4 dc1, int4 dc2);
198 < extern double   fdir2diff(int4 dc1, FVECT v2);
195 > extern int32    encodedir(FVECT dv);
196 > extern void     decodedir(FVECT dv, int32 dc);
197 > extern double   dir2diff(int32 dc1, int32 dc2);
198 > extern double   fdir2diff(int32 dc1, FVECT v2);
199 >                                        /* defined in lamp.c */
200 > extern float * matchlamp(char *s);
201 > extern int loadlamps(char *file);
202 > extern void freelamps(void);
203                                          /* miscellaneous */
204   extern void     eputs(char *s);
205   extern void     wputs(char *s);

Diff Legend

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