Merge 572ab9bc2b into 2372e9518e

random_seed.c

@@ -24,12 +24,6 @@
 #define HAVE_DEV_RANDOM 1
 #endif
 
-#ifdef HAVE_ARC4RANDOM
-#undef HAVE_GETRANDOM
-#undef HAVE_DEV_RANDOM
-#undef HAVE_CRYPTGENRANDOM
-#endif
-
 #if defined ENABLE_RDRAND
 
 /* cpuid */
@@ -327,10 +321,6 @@ int json_c_get_random_seed(void)
 	if (has_rdrand())
 		return get_rdrand_seed();
 #endif
-#ifdef HAVE_ARC4RANDOM
-	/* arc4random never fails, so use it if it's available */
-	return arc4random();
-#else
 #ifdef HAVE_GETRANDOM
 	{
 		int seed = 0;
@@ -352,6 +342,10 @@ int json_c_get_random_seed(void)
 			return seed;
 	}
 #endif
+#ifdef HAVE_ARC4RANDOM
+	/* arc4random never fails, so use it if it's available */
+	return arc4random();
+#else
 	return get_time_seed();
 #endif /* !HAVE_ARC4RANDOM */
 }