From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 10 Mar 2016 11:04:52 +0000 (+0000)
Subject: - Compile fix for pluggable event API from P.Y. Adi Prasaja.
X-Git-Tag: release-1.5.9rc1~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=deee3c8b6abe9bb74838c234425ba1eedb94ea57;p=thirdparty%2Funbound.git

- Compile fix for pluggable event API from P.Y. Adi Prasaja.


git-svn-id: file:///svn/unbound/trunk@3654 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/doc/Changelog b/doc/Changelog
index 971521892..a182ec3f8 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
 09 March 2016: Wouter
 	- Updated configure and ltmain.sh.
 	- Updated L root IPv6 address.
+	- Compile fix for pluggable event API from P.Y. Adi Prasaja.
 
 07 March 2016: Wouter
 	- Fix #747: assert in outnet_serviced_query_stop.
diff --git a/util/ub_event.c b/util/ub_event.c
index 92bb5d2c8..cc2bc7f75 100644
--- a/util/ub_event.c
+++ b/util/ub_event.c
@@ -159,7 +159,7 @@ ub_libevent_event_base(struct event_base* libevent_base)
 }
 
 struct event_base *
-ub_libevent_get_event_base(struct ub_event_base* base)
+ub_libevent_get_event_base(struct ub_event_base* libevent_base)
 {
 #ifdef USE_MINI_EVENT
 	return NULL;
diff --git a/util/ub_event_pluggable.c b/util/ub_event_pluggable.c
index fbae5151f..40a81bc9c 100644
--- a/util/ub_event_pluggable.c
+++ b/util/ub_event_pluggable.c
@@ -103,9 +103,12 @@ ub_get_event_sys(struct ub_event_base* base, const char** n, const char** s,
 	*s = "internal";
 	*m = "select";
 #else
+	struct event_base* b = AS_MY_EVENT_BASE(base);
 	*s = event_get_version();
 #  ifdef HAVE_EVENT_BASE_GET_METHOD
 	*n = "pluggable-libevent";
+	if(!b)
+		b = event_base_new();
 	*m = event_base_get_method(b);
 #  elif defined(HAVE_EV_LOOP) || defined(HAVE_EV_DEFAULT_LOOP)
 	*n = "pluggable-libev";