Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
	evutil_rand.c

1 files changed, 6 insertions, 3 deletions

diff --git a/evutil_rand.c b/evutil_rand.c
index 0dcce7b6..7e7e042b 100644
--- a/evutil_rand.c
+++ b/evutil_rand.c
@@ -84,9 +84,12 @@ ev_arc4random_buf(void *buf, size_t n)
 	 * and fall back otherwise.  (OSX does this using some linker
 	 * trickery.)
 	 */
-	if (arc4random_buf != NULL) {
-		arc4random_buf(buf, n);
-		return;
+	{
+		void (*tptr)() = (void*)arc4random_buf;
+		if (tptr != NULL) {
+			arc4random_buf(buf, n);
+			return;
+		}
 	}
 #endif
 	/* Make sure that we start out with b at a 4-byte alignment; plenty