Also provide erand48 and jrand48, they come almost for free

diff --git a/compat/nrand48.c b/compat/nrand48.c
index 020417e4cb9f993a009d13427822c616960fd15a..ff4e9b138dd0a435ac285d31c9391b3fe751354c 100644 (file)
--- a/compat/nrand48.c
+++ b/compat/nrand48.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * nrand48.c: POSIX nrand48() replacement
+ * nrand48.c: POSIX erand48(), jrand48() and nrand48() replacements
  *****************************************************************************
  * Copyright © 2010 Rémi Denis-Courmont
  *
@@ -24,7 +24,7 @@
 
 #include <inttypes.h>
 
-long nrand48 (unsigned short subi[3])
+static uint64_t iterate48 (unsigned short subi[3])
 {
     const uint64_t a = UINT64_C(0x5DEECE66D);
     const unsigned c = 13;
@@ -42,5 +42,21 @@ long nrand48 (unsigned short subi[3])
     subi[1] = (x >> 16) & 0xFFFF;
     subi[2] = (x >>  0) & 0XFFFF;
 
-    return x >> 17;
+    return x;
+}
+
+double erand48 (unsigned short subi[3])
+{
+    uint64_t r = iterate48 (subi);
+    return ((double)r) / 281474976710655.;
+}
+
+long jrand48 (unsigned short subi[3])
+{
+    return ((int64_t)iterate48 (subi)) >> 16;
+}
+
+long nrand48 (unsigned short subi[3])
+{
+    return iterate48 (subi) >> 17;
 }

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 8e24e0f3c1acbd70e894ddb17ebe1e8ef09e5330..08a16ff95091142c204829176bcaee601a9b6927 100644 (file)
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -241,6 +241,8 @@ struct pollfd
 
 /* Random numbers */
 #ifndef HAVE_NRAND48
+double erand48 (unsigned short subi[3]);
+long jrand48 (unsigned short subi[3]);
 long nrand48 (unsigned short subi[3]);
 #endif