diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-08-02 12:09:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-08-02 12:09:08 -0400 |
| commit | a64c56470d6ff698b87db1660656d4795d845239 (patch) | |
| tree | b3a2437338f4c7654773e84425e5c8fa308676fa | |
| parent | 403b0d6e023e4953446d14b477de09f716ee4240 (diff) | |
| parent | ca80ea61b5f0cf0e3f2e1cef756e7405e22d310b (diff) | |
| download | libevent-a64c56470d6ff698b87db1660656d4795d845239.tar.gz | |
Merge remote-tracking branch 'origin/patches-2.0'
Conflicts:
evutil_rand.c
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | evutil_rand.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 89494b4d..ae2fa703 100644 --- a/configure.in +++ b/configure.in @@ -44,6 +44,7 @@ dnl the 'host' machine is where the resulting stuff runs. dnl Checks for programs. AM_PROG_CC_C_O +AC_PROG_SED AC_PROG_INSTALL AC_PROG_LN_S # AC_PROG_MKDIR_P - $(MKDIR_P) should be defined by AM_INIT_AUTOMAKE diff --git a/evutil_rand.c b/evutil_rand.c index dd31a8df..0073307f 100644 --- a/evutil_rand.c +++ b/evutil_rand.c @@ -65,10 +65,10 @@ evutil_free_secure_rng_globals_locks(void) static void ev_arc4random_buf(void *buf, size_t n) { - unsigned char *b = buf; #if defined(EVENT__HAVE_ARC4RANDOM_BUF) && !defined(__APPLE__) return arc4random_buf(buf, n); #else + unsigned char *b = buf; #if defined(EVENT__HAVE_ARC4RANDOM_BUF) /* OSX 10.7 introducd arc4random_buf, so if you build your program |