From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 19 Sep 2013 14:48:27 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.4-alpha~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a093137809252f24ee70f3258a5e2a81cd3551e8;p=libevent

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

a093137809252f24ee70f3258a5e2a81cd3551e8
diff --cc evutil_rand.c
index 7e7e042b,284341cf..046a14b0
--- a/evutil_rand.c
+++ b/evutil_rand.c
@@@ -85,10 -77,10 +85,11 @@@ ev_arc4random_buf(void *buf, size_t n
  	 * trickery.)
  	 */
  	{
- 		void (*tptr)() = (void*)arc4random_buf;
+ 		void (*tptr)(void *,size_t) =
+ 		    (void (*)(void*,size_t))arc4random_buf;
  		if (tptr != NULL) {
 -			return arc4random_buf(buf, n);
 +			arc4random_buf(buf, n);
 +			return;
  		}
  	}
  #endif