--- ray/src/common/random.h	2011/04/09 15:39:16	2.18
+++ ray/src/common/random.h	2015/05/27 08:37:26	2.20
@@ -1,4 +1,4 @@
-/* RCSid $Id: random.h,v 2.18 2011/04/09 15:39:16 greg Exp $ */
+/* RCSid $Id: random.h,v 2.20 2015/05/27 08:37:26 greg Exp $ */
 /*
  *  random.h - header file for random(3) and urand() function.
  */
@@ -10,6 +10,8 @@ extern "C" {
 
 #ifdef	_WIN32
 
+#include <stdlib.h>
+
 #if (RAND_MAX <= 65536)
 #define random()	((long)rand()<<16^(long)rand()<<6^(long)rand()>>4)
 #else
@@ -20,14 +22,7 @@ extern "C" {
 #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();
 
@@ -36,12 +31,11 @@ extern double  drand48();
 #define	 frandom()	drand48()
 
 #endif
-#endif
 
 extern unsigned short	*urperm;
 extern int	urmask;
 
-#define	 urand(i)	(urmask ? (urperm[(i)&urmask]+frandom())/(urmask+1) \
+#define	 urand(i)	(urmask ? (urperm[(i)&urmask]+frandom())/(urmask+1.) \
 				: frandom())
 
 extern int	initurand(int size);