projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix printf-tests on W32 by ifdefing the expected output
[platform/upstream/glib.git]
/
glib
/
grand.h
diff --git
a/glib/grand.h
b/glib/grand.h
index
07907df
..
9011404
100644
(file)
--- a/
glib/grand.h
+++ b/
glib/grand.h
@@
-12,9
+12,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
/*
*/
/*
@@
-24,13
+22,13
@@
* GLib at ftp://ftp.gtk.org/pub/gtk/.
*/
* GLib at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
#ifndef __G_RAND_H__
#define __G_RAND_H__
#ifndef __G_RAND_H__
#define __G_RAND_H__
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
#include <glib/gtypes.h>
G_BEGIN_DECLS
#include <glib/gtypes.h>
G_BEGIN_DECLS
@@
-38,7
+36,7
@@
G_BEGIN_DECLS
typedef struct _GRand GRand;
/* GRand - a good and fast random number generator: Mersenne Twister
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.
+ * see http://www.math.
sci.hiroshima-u.ac.jp/~m-mat/MT
/emt.html for more info.
* The range functions return a value in the intervall [begin, end).
* int -> [0..2^32-1]
* int_range -> [begin..end-1]
* The range functions return a value in the intervall [begin, end).
* int -> [0..2^32-1]
* int_range -> [begin..end-1]
@@
-46,36
+44,52
@@
typedef struct _GRand GRand;
* double_range -> [begin..end)
*/
* double_range -> [begin..end)
*/
+GLIB_AVAILABLE_IN_ALL
GRand* g_rand_new_with_seed (guint32 seed);
GRand* g_rand_new_with_seed (guint32 seed);
+GLIB_AVAILABLE_IN_ALL
GRand* g_rand_new_with_seed_array (const guint32 *seed,
guint seed_length);
GRand* g_rand_new_with_seed_array (const guint32 *seed,
guint seed_length);
+GLIB_AVAILABLE_IN_ALL
GRand* g_rand_new (void);
GRand* g_rand_new (void);
+GLIB_AVAILABLE_IN_ALL
void g_rand_free (GRand *rand_);
void g_rand_free (GRand *rand_);
+GLIB_AVAILABLE_IN_ALL
GRand* g_rand_copy (GRand *rand_);
GRand* g_rand_copy (GRand *rand_);
+GLIB_AVAILABLE_IN_ALL
void g_rand_set_seed (GRand *rand_,
guint32 seed);
void g_rand_set_seed (GRand *rand_,
guint32 seed);
+GLIB_AVAILABLE_IN_ALL
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)
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)
+GLIB_AVAILABLE_IN_ALL
guint32 g_rand_int (GRand *rand_);
guint32 g_rand_int (GRand *rand_);
+GLIB_AVAILABLE_IN_ALL
gint32 g_rand_int_range (GRand *rand_,
gint32 begin,
gint32 end);
gint32 g_rand_int_range (GRand *rand_,
gint32 begin,
gint32 end);
+GLIB_AVAILABLE_IN_ALL
gdouble g_rand_double (GRand *rand_);
gdouble g_rand_double (GRand *rand_);
+GLIB_AVAILABLE_IN_ALL
gdouble g_rand_double_range (GRand *rand_,
gdouble begin,
gdouble end);
gdouble g_rand_double_range (GRand *rand_,
gdouble begin,
gdouble end);
+GLIB_AVAILABLE_IN_ALL
void g_random_set_seed (guint32 seed);
#define g_random_boolean() ((g_random_int () & (1 << 15)) != 0)
void g_random_set_seed (guint32 seed);
#define g_random_boolean() ((g_random_int () & (1 << 15)) != 0)
+GLIB_AVAILABLE_IN_ALL
guint32 g_random_int (void);
guint32 g_random_int (void);
+GLIB_AVAILABLE_IN_ALL
gint32 g_random_int_range (gint32 begin,
gint32 end);
gint32 g_random_int_range (gint32 begin,
gint32 end);
+GLIB_AVAILABLE_IN_ALL
gdouble g_random_double (void);
gdouble g_random_double (void);
+GLIB_AVAILABLE_IN_ALL
gdouble g_random_double_range (gdouble begin,
gdouble end);
gdouble g_random_double_range (gdouble begin,
gdouble end);