diff options
author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2019-06-30 15:01:11 +0000 |
---|---|---|
committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2019-06-30 15:01:11 +0000 |
commit | 366b94c4a9552acfb560d3234aea0955ebc1eb8e (patch) | |
tree | 0bee3a4dbb699714374eeab0af43e63f1bf9672d /util/ub_event.c | |
parent | 4713c21a1ac91081e50e474d11fcec002b43a562 (diff) | |
download | src-vendor/unbound/1.9.2.tar.gz src-vendor/unbound/1.9.2.zip |
Vendor import of Unbound 1.9.2.vendor/unbound/1.9.2
Diffstat (limited to 'util/ub_event.c')
-rw-r--r-- | util/ub_event.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/util/ub_event.c b/util/ub_event.c index 78481a982055..e097fbc40158 100644 --- a/util/ub_event.c +++ b/util/ub_event.c @@ -295,11 +295,18 @@ ub_event_new(struct ub_event_base* base, int fd, short bits, if (!ev) return NULL; +#ifndef HAVE_EVENT_ASSIGN event_set(ev, fd, NATIVE_BITS(bits), NATIVE_BITS_CB(cb), arg); if (event_base_set(AS_EVENT_BASE(base), ev) != 0) { free(ev); return NULL; } +#else + if (event_assign(ev, AS_EVENT_BASE(base), fd, bits, cb, arg) != 0) { + free(ev); + return NULL; + } +#endif return AS_UB_EVENT(ev); } @@ -312,11 +319,18 @@ ub_signal_new(struct ub_event_base* base, int fd, if (!ev) return NULL; +#if !HAVE_DECL_EVSIGNAL_ASSIGN signal_set(ev, fd, NATIVE_BITS_CB(cb), arg); if (event_base_set(AS_EVENT_BASE(base), ev) != 0) { free(ev); return NULL; } +#else + if (evsignal_assign(ev, AS_EVENT_BASE(base), fd, cb, arg) != 0) { + free(ev); + return NULL; + } +#endif return AS_UB_EVENT(ev); } |