--- ray/src/common/random.h	2003/02/25 02:47:21	2.9
+++ ray/src/common/random.h	2011/04/09 15:39:16	2.18
@@ -1,28 +1,23 @@
-/* RCSid $Id: random.h,v 2.9 2003/02/25 02:47:21 greg Exp $ */
+/* RCSid $Id: random.h,v 2.18 2011/04/09 15:39:16 greg Exp $ */
 /*
  *  random.h - header file for random(3) and urand() function.
  */
+#ifndef _RAD_RANDOM_H_
+#define _RAD_RANDOM_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#include "copyright.h"
+#ifdef	_WIN32
 
-#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
-
-#ifdef	MSDOS
-
+#if (RAND_MAX <= 65536)
 #define random()	((long)rand()<<16^(long)rand()<<6^(long)rand()>>4)
+#else
+#define random()	rand()
+#endif
 #define srandom(s)	srand((unsigned)(s))
 
-#define frandom()	(rand()*(1./32768.))
+#define frandom()	(rand()*(1./(RAND_MAX+.5)))
 
 #else
 #ifdef	BSD
@@ -43,36 +38,24 @@ extern double  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_ */
+