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

Comparing ray/src/common/random.h (file contents):
Revision 2.15 by greg, Mon Jun 13 20:07:56 2005 UTC vs.
Revision 2.19 by greg, Mon Jan 26 20:04:30 2015 UTC

# Line 10 | Line 10 | extern "C" {
10  
11   #ifdef  _WIN32
12  
13 + #include <stdlib.h>
14 +
15   #if (RAND_MAX <= 65536)
16   #define random()        ((long)rand()<<16^(long)rand()<<6^(long)rand()>>4)
17   #else
# Line 17 | Line 19 | extern "C" {
19   #endif
20   #define srandom(s)      srand((unsigned)(s))
21  
22 < #define frandom()       (rand()*(1./RAND_MAX))
22 > #define frandom()       (rand()*(1./(RAND_MAX+.5)))
23  
24   #else
25   #ifdef  BSD
# Line 41 | Line 43 | extern double  drand48();
43   extern unsigned short   *urperm;
44   extern int      urmask;
45  
46 < #define  urand(i)       ((urperm[(i)&urmask]+frandom())/(urmask+1))
46 > #define  urand(i)       (urmask ? (urperm[(i)&urmask]+frandom())/(urmask+1) \
47 >                                : frandom())
48  
49   extern int      initurand(int size);
50  

Diff Legend

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