make it possible to disable single-file includes by defining

[platform/upstream/glib.git] / glib / grand.h

diff --git a/glib/grand.h b/glib/grand.h
index 38f4e5e..fd2847e 100644 (file)
--- a/glib/grand.h
+++ b/glib/grand.h
@@ -21,13 +21,17 @@
  * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GLib Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/. 
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
 #ifndef __G_RAND_H__
 #define __G_RAND_H__
 
-#include <gtypes.h>
+#include <glib/gtypes.h>
 
 G_BEGIN_DECLS
 
@@ -35,42 +39,47 @@ typedef struct _GRand           GRand;
 
 /* GRand - a good and fast random number generator: Mersenne Twister
  * see http://www.math.keio.ac.jp/~matumoto/emt.html for more info.
- * The range functions return a value in the intervall [min,max).
+ * The range functions return a value in the intervall [begin, end).
  * int          -> [0..2^32-1]
- * int_range    -> [min..max-1]
+ * int_range    -> [begin..end-1]
  * double       -> [0..1)
- * double_range -> [min..max)
+ * double_range -> [begin..end)
  */
 
-GRand*  g_rand_new_with_seed   (guint32     seed);
-GRand*  g_rand_new             (void);
-void    g_rand_free            (GRand      *rand);
-
-void    g_rand_set_seed        (GRand      *rand,
-                                guint32     seed);
-guint32 g_rand_int             (GRand      *rand);
-gint32  g_rand_int_range       (GRand      *rand,
-                                gint32      min,
-                                gint32      max);
-gdouble g_rand_double          (GRand      *rand);
-gdouble g_rand_double_range    (GRand      *rand,
-                                gdouble     min,
-                                gdouble     max);
+GRand*  g_rand_new_with_seed  (guint32  seed);
+GRand*  g_rand_new_with_seed_array (const guint32 *seed,
+                                   guint seed_length);
+GRand*  g_rand_new            (void);
+void    g_rand_free           (GRand   *rand_);
+GRand*  g_rand_copy           (GRand   *rand_);
+void    g_rand_set_seed       (GRand   *rand_,
+                              guint32  seed);
+void   g_rand_set_seed_array (GRand   *rand_,
+                              const guint32 *seed,
+                              guint    seed_length);
+
+#define g_rand_boolean(rand_) ((g_rand_int (rand_) & (1 << 15)) != 0)
+
+guint32 g_rand_int            (GRand   *rand_);
+gint32  g_rand_int_range      (GRand   *rand_,
+                              gint32   begin,
+                              gint32   end);
+gdouble g_rand_double         (GRand   *rand_);
+gdouble g_rand_double_range   (GRand   *rand_,
+                              gdouble  begin,
+                              gdouble  end);
+void    g_random_set_seed     (guint32  seed);
+
+#define g_random_boolean() ((g_random_int () & (1 << 15)) != 0)
+
+guint32 g_random_int          (void);
+gint32  g_random_int_range    (gint32   begin,
+                              gint32   end);
+gdouble g_random_double       (void);
+gdouble g_random_double_range (gdouble  begin,
+                              gdouble  end);
 
-void    g_random_set_seed      (guint32     seed);
-guint32 g_random_int           (void);
-gint32  g_random_int_range     (gint32      min,
-                                gint32      max);
-gdouble g_random_double        (void);
-gdouble g_random_double_range  (gdouble     min,
-                                gdouble     max);
 
 G_END_DECLS
 
 #endif /* __G_RAND_H__ */
-
-
-
-
-
-