tests: Improve RNG compatibility with old compilers.

[cdecl99.git] / t / rng.c

diff --git a/t/rng.c b/t/rng.c
index 3842d3de1ca1c107f11cb3b09ac6e4aec24990ac..e442d994fe5cbcd2fef22930e7ed133d3727e76a 100644 (file)
--- a/t/rng.c
+++ b/t/rng.c
@@ -28,9 +28,11 @@
 #include <errno.h>
 #include <limits.h>
 
-#include "test.h"
+#if !TEST_RNG_NO_EXTERNAL_API
+#  include "test.h"
+#endif
 
-#define B64(x) ((x) & 0xffffffffffffffff)
+#define B64(x) ((x) & 0xffffffffffffffffull)
 
 struct test_rng {
        unsigned long long state[4];
@@ -63,13 +65,14 @@ static unsigned long long splitmix64(unsigned long long *state)
 {
        unsigned long long z;
 
-       z = B64(*state += 0x9e3779b97f4a7c15);
-       z = B64((z ^ (z >> 30)) * 0xbf58476d1ce4e5b9);
-       z = B64((z ^ (z >> 27)) * 0x94d049bb133111eb);
+       z = B64(*state += 0x9e3779b97f4a7c15ull);
+       z = B64((z ^ (z >> 30)) * 0xbf58476d1ce4e5b9ull);
+       z = B64((z ^ (z >> 27)) * 0x94d049bb133111ebull);
 
        return z ^ (z >> 31);
 }
 
+#if !TEST_RNG_NO_EXTERNAL_API
 struct test_rng *test_rng_alloc(const char *seed_str)
 {
        unsigned long long seed;
@@ -80,7 +83,7 @@ struct test_rng *test_rng_alloc(const char *seed_str)
        limit |= (limit << 16 << 16);
 
        if (!test_strtoumax(&seed_val, seed_str, limit)) {
-               fprintf(stderr, "%s: invalid seed\n", seed_str);
+               print_error("%s: invalid seed", seed_str);
                return NULL;
        }
        seed = seed_val;
@@ -124,3 +127,4 @@ unsigned test_rng_uniform_int(struct test_rng *rng, unsigned max)
 
        return val;
 }
+#endif