test: Move random number generator from blitters/scaling-test to utils.[ch]

diff --git a/test/blitters-test.c b/test/blitters-test.c
index 6339f91..80fc8fa 100644 (file)
--- a/test/blitters-test.c
+++ b/test/blitters-test.c
@@ -25,32 +25,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <config.h>
-#include "pixman.h"
 #include "utils.h"
 
 /* A primitive pseudorandom number generator, taken from POSIX.1-2001 example */
 
-static uint32_t lcg_seed;
-
-static inline uint32_t
-lcg_rand (void)
-{
-    lcg_seed = lcg_seed * 1103515245 + 12345;
-    return ((uint32_t)(lcg_seed / 65536) % 32768);
-}
-
-static inline void
-lcg_srand (uint32_t seed)
-{
-    lcg_seed = seed;
-}
-
-static inline uint32_t
-lcg_rand_n (int max)
-{
-    return lcg_rand () % max;
-}
-
 static void *
 aligned_malloc (size_t align, size_t size)
 {

diff --git a/test/scaling-test.c b/test/scaling-test.c
index 8678b29..296b986 100644 (file)
--- a/test/scaling-test.c
+++ b/test/scaling-test.c
@@ -23,32 +23,8 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "pixman.h"
 #include "utils.h"
 
-/* A primitive pseudorandom number generator, taken from POSIX.1-2001 example */
-
-static uint32_t lcg_seed;
-
-uint32_t
-lcg_rand (void)
-{
-    lcg_seed = lcg_seed * 1103515245 + 12345;
-    return ((uint32_t)(lcg_seed / 65536) % 32768);
-}
-
-void
-lcg_srand (uint32_t seed)
-{
-    lcg_seed = seed;
-}
-
-uint32_t
-lcg_rand_n (int max)
-{
-    return lcg_rand () % max;
-}
-
 /* perform endian conversion of pixel data */
 static void
 image_endian_swap (pixman_image_t *img,

diff --git a/test/utils.c b/test/utils.c
index 46eed4c..afd2a18 100644 (file)
--- a/test/utils.c
+++ b/test/utils.c
@@ -1,5 +1,10 @@
 #include "utils.h"
 
+/* Random number seed
+ */
+
+uint32_t lcg_seed;
+
 /*----------------------------------------------------------------------------*\
  *  CRC-32 version 2.0.0 by Craig Bruce, 2006-04-29.
  *

diff --git a/test/utils.h b/test/utils.h
index 39ce998..2d340d1 100644 (file)
--- a/test/utils.h
+++ b/test/utils.h
@@ -1,7 +1,37 @@
 #include <stdlib.h>
-#include "pixman.h"
+#include <config.h>
+#include "pixman-private.h" /* For 'inline' definition */
 
+/* A primitive pseudorandom number generator,
+ * taken from POSIX.1-2001 example
+ */
+
+extern uint32_t lcg_seed;
+
+static inline uint32_t
+lcg_rand (void)
+{
+    lcg_seed = lcg_seed * 1103515245 + 12345;
+    return ((uint32_t)(lcg_seed / 65536) % 32768);
+}
+
+static inline void
+lcg_srand (uint32_t seed)
+{
+    lcg_seed = seed;
+}
+
+static inline uint32_t
+lcg_rand_n (int max)
+{
+    return lcg_rand () % max;
+}
+
+
+/* CRC 32 computation
+ */
 uint32_t
 compute_crc32 (uint32_t    in_crc32,
               const void *buf,
               size_t      buf_len);
+