# | Line 8 | Line 8 | static const char RCSid[] = "$Id$"; | |
---|---|---|
8 | */ | |
9 | ||
10 | #include "standard.h" | |
11 | < | |
11 | > | #include "platform.h" |
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 194 | 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,&) |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |