GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-31 09:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	configure.in
This commit is contained in:
Nick Mathewson 2011-12-08 11:43:04 -05:00
commit d430602863
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arc4random.c
View File

@ -167,7 +167,7 @@ arc4_seed_win32(void)
} }
#endif #endif
#if defined(_EVENT_HAVE_SYS_SYSCTL_H) #if defined(_EVENT_HAVE_SYS_SYSCTL_H) && defined(_EVENT_HAVE_SYSCTL)
#if _EVENT_HAVE_DECL_CTL_KERN && _EVENT_HAVE_DECL_KERN_RANDOM && _EVENT_HAVE_DECL_RANDOM_UUID #if _EVENT_HAVE_DECL_CTL_KERN && _EVENT_HAVE_DECL_KERN_RANDOM && _EVENT_HAVE_DECL_RANDOM_UUID
#define TRY_SEED_SYSCTL_LINUX #define TRY_SEED_SYSCTL_LINUX
static int static int

1
configure.in
View File

@ -332,6 +332,7 @@ AC_CHECK_FUNCS([ \
strsep \ strsep \
strtok_r \ strtok_r \
strtoll \ strtoll \
sysctl \
unsetenv \ unsetenv \
vasprintf \ vasprintf \
]) ])