ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/ot/oconv.c
(Generate patch)

Comparing ray/src/ot/oconv.c (file contents):
Revision 2.16 by schorsch, Sun Jun 8 12:03:10 2003 UTC vs.
Revision 2.18 by greg, Wed Oct 22 02:06:34 2003 UTC

# Line 7 | Line 7 | static const char RCSid[] = "$Id$";
7   *     7/29/85
8   */
9  
10 #include  "standard.h"
10   #include  "platform.h"
11 + #include  "standard.h"
12   #include  "octree.h"
13   #include  "object.h"
14   #include  "otypes.h"
# Line 191 | Line 191 | register char  *s;
191                  inln = 0;
192   }
193  
194 +                                /* conflicting def's in param.h */
195 + #undef  tstbit
196 + #undef  setbit
197 + #undef  clrbit
198 + #undef  tglbit
199  
200   #define  bitop(f,i,op)          (f[((i)>>3)] op (1<<((i)&7)))
201   #define  tstbit(f,i)            bitop(f,i,&)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines