ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/pmap.h
(Generate patch)

Comparing ray/src/rt/pmap.h (file contents):
Revision 2.1 by greg, Tue Feb 24 19:39:26 2015 UTC vs.
Revision 2.2 by greg, Tue Apr 21 19:16:51 2015 UTC

# Line 18 | Line 18
18     #include "pmapdata.h"
19  
20  
21 <
22 <   #define min(a, b) ((a) < (b) ? (a) : (b))
23 <   #define max(a, b) ((a) > (b) ? (a) : (b))
21 >   #ifndef min
22 >      #define min(a, b) ((a) < (b) ? (a) : (b))
23 >   #endif
24 >  
25 >   #ifndef max
26 >      #define max(a, b) ((a) > (b) ? (a) : (b))
27 >   #endif
28 >  
29     #define sqr(a)    ((a) * (a))
30  
31     /* Average over colour channels */

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)