cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-19 09:15:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	evutil_rand.c
This commit is contained in:
Nick Mathewson 2012-08-02 12:09:08 -04:00
commit a64c56470d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.in
View File

@ -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

2
evutil_rand.c
View File

@ -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