--- ray/src/common/random.h	2015/01/26 20:04:30	2.19
+++ ray/src/common/random.h	2016/03/06 01:13:17	2.23
@@ -1,17 +1,17 @@
-/* RCSid $Id: random.h,v 2.19 2015/01/26 20:04:30 greg Exp $ */
+/* RCSid $Id: random.h,v 2.23 2016/03/06 01:13:17 schorsch 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	_WIN32
-
-#include <stdlib.h>
-
+#if defined(_WIN32) || defined(_WIN64)
 #if (RAND_MAX <= 65536)
 #define random()	((long)rand()<<16^(long)rand()<<6^(long)rand()>>4)
 #else
@@ -22,28 +22,17 @@ 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();
-
 #define	 random()	lrand48()
 #define  srandom(s)	srand48((long)(s))
 #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);