--- ray/src/common/random.h	2003/06/05 19:29:34	2.11
+++ ray/src/common/random.h	2016/03/06 01:13:17	2.23
@@ -1,24 +1,17 @@
-/* RCSid $Id: random.h,v 2.11 2003/06/05 19:29:34 schorsch 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 "copyright.h"
+#include <stdlib.h>
 
-#ifdef  NORANDOM
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#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
-
-#ifdef	_WIN32
-
+#if defined(_WIN32) || defined(_WIN64)
 #if (RAND_MAX <= 65536)
 #define random()	((long)rand()<<16^(long)rand()<<6^(long)rand()>>4)
 #else
@@ -26,57 +19,34 @@
 #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
-
 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())
 
-#endif
+extern int	initurand(int size);
 
-#endif
-
-#ifdef NOPROTO
-
-extern int	initurand();
-extern int	ilhash();
-extern int	urind();
-extern void	multisamp();
-
-#else
 				/* defined in urand.c */
-extern int	initurand(int size);
 extern int	ilhash(int *d, int n);
 				/* defined in urind.c */
 extern int	urind(int s, int i);
 				/* defined in multisamp.c */
 extern void	multisamp(double t[], int n, double r);
 
+
+#ifdef __cplusplus
+}
 #endif
+#endif /* _RAD_RANDOM_H_ */
+