- 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 971521892b9692d6866d3eadd923f0fb0e9e7b48..a182ec3f8cabf64651ef347666cf25d89252a9b0 100644 (file)
--- 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 92bb5d2c8dc75cc257892e118f59c8cf6ebf1f5b..cc2bc7f756eace96ea36635a42ae19de794323d1 100644 (file)
--- 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 fbae5151f7fe889690a52393cf6e79e4de6bb57a..40a81bc9c287e954c40d4eb104554a0e7bddda97 100644 (file)
--- 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";