X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utils%2Fyarandom.h;h=5a23e43d27382f42035d2a04e25ed1729eb707ba;hb=06e9a7886a77cad92f9ddbc169d6d199a4d8b76d;hp=6563be7ed29ef2d41a090a9ed61caf0e5aa36edc;hpb=f3e0240915ed9f9b3a61781f5c7002d587563fe0;p=xscreensaver

diff --git a/utils/yarandom.h b/utils/yarandom.h
index 6563be7e..5a23e43d 100644
--- a/utils/yarandom.h
+++ b/utils/yarandom.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1997 by Jamie Zawinski <jwz@netscape.com>
+/* xscreensaver, Copyright (c) 1997, 1998 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
@@ -19,17 +19,29 @@
 #undef srand
 #undef srand48
 #undef frand
+#undef RAND_MAX
 
 #ifdef VMS
 # include "vms-gtod.h"
 #endif
 
-#define random()   ya_random()
-#define srandom(i) ya_rand_init(0)
-
 extern unsigned int ya_random (void);
 extern void ya_rand_init (unsigned int);
 
+#define random()   ya_random()
+#define RAND_MAX   0x7FFFFFFF
+
+/*#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_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__
+#define ya_rand_init  __ERROR_do_not_call_ya_rand_init_in_xscreensaver__
+
 
 #if defined (__GNUC__) && (__GNUC__ >= 2)
  /* Implement frand using GCC's statement-expression extension. */