X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utils%2Fyarandom.h;h=3a4acbf0b07ddc69be58caa85c2cafe76e833654;hb=2c902d6065f9856adf31e8540a94f1e42e68e905;hp=0e1dfcfb7619112ea1d7d21b233062488800b1ce;hpb=0ed85ca0e4b0eae40a4f50a51d63f2f41e45373a;p=xscreensaver

diff --git a/utils/yarandom.h b/utils/yarandom.h
index 0e1dfcfb..3a4acbf0 100644
--- a/utils/yarandom.h
+++ b/utils/yarandom.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1997, 1998 by Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1997, 1998, 2003 by Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -29,14 +29,14 @@ extern unsigned int ya_random (void);
 extern void ya_rand_init (unsigned int);
 
 #define random()   ya_random()
-#define RAND_MAX   0x7FFFFFFF
+#define RAND_MAX   0xFFFFFFFF
 
 /*#define srandom(i) ya_rand_init(0)*/
 
 /* Define these away to keep people from using the wrong APIs in xscreensaver.
  */
 #define rand          __ERROR_use_random_not_rand_in_xscreensaver__
-#define drand48       __ERROR_use_random_not_drand48_in_xscreensaver__
+#define drand48       __ERROR_use_frand_not_drand48_in_xscreensaver__
 #define srandom       __ERROR_do_not_call_srandom_in_xscreensaver__
 #define srand         __ERROR_do_not_call_srand_in_xscreensaver__
 #define srand48       __ERROR_do_not_call_srand48_in_xscreensaver__
@@ -47,16 +47,16 @@ extern void ya_rand_init (unsigned int);
  /* Implement frand using GCC's statement-expression extension. */
 
 # define frand(f)							\
-  ({ double tmp = (((double) random()) /				\
-		   (((double) ((unsigned int)~0)) / ((double) (f))));	\
+  ({ double tmp = ((((double) random()) * ((double) (f))) /		\
+		   ((double) ((unsigned int)~0)));			\
      tmp < 0 ? (-tmp) : tmp; })
 
 #else /* not GCC2 - implement frand using a global variable.*/
 
 static double _frand_tmp_;
 # define frand(f)							\
-  (_frand_tmp_ = (((double) random()) / 				\
-		  (((double) ((unsigned int)~0)) / ((double) (f)))),	\
+  (_frand_tmp_ = ((((double) random()) * ((double) (f))) /		\
+		  ((double) ((unsigned int)~0))),			\
    _frand_tmp_ < 0 ? (-_frand_tmp_) : _frand_tmp_)
 
 #endif /* not GCC2 */