--- ray/src/common/random.h	2003/02/25 02:47:21	2.9
+++ ray/src/common/random.h	2003/06/27 06:53:21	2.13
@@ -1,10 +1,13 @@
-/* RCSid $Id: random.h,v 2.9 2003/02/25 02:47:21 greg Exp $ */
+/* RCSid $Id: random.h,v 2.13 2003/06/27 06:53:21 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  NORANDOM
 
 #undef  random
@@ -17,12 +20,16 @@
 
 #else
 
-#ifdef	MSDOS
+#ifdef	_WIN32
 
+#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))
 
 #else
 #ifdef	BSD
@@ -59,14 +66,6 @@ extern int	urmask;
 
 #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);
@@ -75,4 +74,9 @@ 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_ */
+