Update plibc header

[oweals/gnunet.git] / src / util / crypto_random.c

diff --git a/src/util/crypto_random.c b/src/util/crypto_random.c
index 8ba6641b9d8cb13cac8f6845cc956000f1ab6e74..e66c3c71b0d420c1795313c7d145c1c0a1da4ac4 100644 (file)
--- a/src/util/crypto_random.c
+++ b/src/util/crypto_random.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -25,9 +25,7 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_os_lib.h"
+#include "gnunet_util_lib.h"
 #include <gcrypt.h>
 
 #define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
@@ -37,7 +35,7 @@
 
 /* TODO: ndurner, move this to plibc? */
 /* The code is derived from glibc, obviously */
-#if MINGW
+#if !HAVE_RANDOM || !HAVE_SRANDOM
 #ifdef RANDOM
 #undef RANDOM
 #endif
@@ -281,7 +279,7 @@ entropy_generator (void *cls, const char *what, int printchar, int current,
   LOG (GNUNET_ERROR_TYPE_INFO, _("Starting `%s' process to generate entropy\n"),
        "find");
   genproc =
-     GNUNET_OS_start_process (GNUNET_NO, 0, 
+     GNUNET_OS_start_process (GNUNET_NO, 0,
                              NULL, NULL, "sh", "sh", "-c",
                              "exec find / -mount -type f -exec cp {} /dev/null \\; 2>/dev/null",
                              NULL);
@@ -300,7 +298,7 @@ killfind ()
 }
 
 
-void __attribute__ ((constructor)) 
+void __attribute__ ((constructor))
 GNUNET_CRYPTO_random_init ()
 {
   gcry_error_t rc;
@@ -321,7 +319,7 @@ GNUNET_CRYPTO_random_init ()
   if ((rc = gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0)))
     FPRINTF (stderr,  "Failed to set libgcrypt option %s: %s\n", "ENABLE_QUICK_RANDOM",
             gcry_strerror (rc));
-  
+
 #ifdef GCRYCTL_INITIALIZATION_FINISHED
   gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
 #endif
@@ -336,7 +334,7 @@ GNUNET_CRYPTO_random_init ()
 }
 
 
-void __attribute__ ((destructor)) 
+void __attribute__ ((destructor))
 GNUNET_CRYPTO_random_fini ()
 {
   gcry_set_progress_handler (NULL, NULL);