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

Comparing ray/src/ot/oconv.c (file contents):
Revision 2.14 by greg, Wed Mar 12 17:26:58 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  "platform.h"
11   #include  "standard.h"
11 –
12   #include  "octree.h"
13 –
13   #include  "object.h"
15 –
14   #include  "otypes.h"
17 –
15   #include  "paths.h"
16  
17   #define  OMARGIN        (10*FTINY)      /* margin around global cube */
# Line 85 | Line 82 | char  *argv[];
82                          break;
83                  }
84   breakopt:
85 < #ifdef MSDOS
89 <        setmode(fileno(stdout), O_BINARY);
90 < #endif
85 >        SET_FILE_BINARY(stdout);
86          if (infile != NULL) {           /* get old octree & objects */
87                  if (thescene.cusize > FTINY)
88                          error(USER, "only one of '-b' or '-i'");
# Line 196 | 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 (old)
> Changed lines (new)