ftp://netsw.org/x11/tools/desktop/xscreensaver-4.07.tar.gz

[xscreensaver] / utils / yarandom.h

diff --git a/utils/yarandom.h b/utils/yarandom.h
index a77e34bfe7ddade1763bc4bea2fe88d9ef600a4c..14a287fa8c04ef432086bc3768ac8d2dde6ad0f7 100644 (file)
--- a/utils/yarandom.h
+++ b/utils/yarandom.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1997 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
@@ -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   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_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. */