--- ray/src/common/random.h	2003/06/29 16:51:48	2.14
+++ ray/src/common/random.h	2015/07/16 05:08:57	2.22
@@ -1,25 +1,16 @@
-/* RCSid $Id: random.h,v 2.14 2003/06/29 16:51:48 greg Exp $ */
+/* RCSid $Id: random.h,v 2.22 2015/07/16 05:08:57 greg Exp $ */
 /*
  *  random.h - header file for random(3) and urand() function.
  */
 #ifndef _RAD_RANDOM_H_
 #define _RAD_RANDOM_H_
+
+#include <stdlib.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifdef  NORANDOM
-
-#undef  random
-#define  random()	1073741820
-#undef  srandom
-#define  srandom(s)	(s)
-#define  frandom()	0.5
-#define  urand(i)	0.5
-#define  initurand(n)	(n)
-
-#else	/* ! NORANDOM */
-
 #ifdef	_WIN32
 
 #if (RAND_MAX <= 65536)
@@ -29,44 +20,23 @@ extern "C" {
 #endif
 #define srandom(s)	srand((unsigned)(s))
 
-#define frandom()	(rand()*(1./RAND_MAX))
+#define frandom()	(rand()*(1./(RAND_MAX+.5)))
 
 #else
-#ifdef	BSD
 
-extern long  random();
-
-#define	 frandom()	(random()*(1./2147483648.))
-
-#else
-
-extern long  lrand48();
-extern double  drand48();
-
 #define	 random()	lrand48()
 #define  srandom(s)	srand48((long)(s))
 #define	 frandom()	drand48()
 
 #endif
-#endif
 
-#ifdef  MC
-
-#define  urand(i)	frandom()
-#define  initurand(n)	(n)
-
-#else	/* ! MC */
-
 extern unsigned short	*urperm;
 extern int	urmask;
 
-#define	 urand(i)	((urperm[(i)&urmask]+frandom())/(urmask+1))
+#define	 urand(i)	(urmask ? (urperm[(i)&urmask]+frandom())/(urmask+1.) \
+				: frandom())
 
 extern int	initurand(int size);
-
-#endif	/* ! MC */
-
-#endif	/* ! NORANDOM */
 
 				/* defined in urand.c */
 extern int	ilhash(int *d, int n);