[master] e7ed39857 Cater for the older kevent(2) API still in use on NetBSD
Poul-Henning Kamp
phk at FreeBSD.org
Wed Aug 4 08:05:07 UTC 2021
commit e7ed398572051d0ea87d93722b28237c7755aaad
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Wed Aug 4 08:04:19 2021 +0000
Cater for the older kevent(2) API still in use on NetBSD
Fixes: #3642
diff --git a/bin/varnishd/waiter/cache_waiter_kqueue.c b/bin/varnishd/waiter/cache_waiter_kqueue.c
index 27ff1cca6..8e70af060 100644
--- a/bin/varnishd/waiter/cache_waiter_kqueue.c
+++ b/bin/varnishd/waiter/cache_waiter_kqueue.c
@@ -113,11 +113,11 @@ vwk_thread(void *priv)
now = VTIM_real();
for (kp = ke, j = 0; j < n; j++, kp++) {
assert(kp->filter == EVFILT_READ);
- if (ke[j].udata == vwk) {
+ if ((uintptr_t)ke[j].udata == (uintptr_t)vwk) {
assert(read(vwk->pipe[0], &c, 1) == 1);
continue;
}
- CAST_OBJ_NOTNULL(wp, ke[j].udata, WAITED_MAGIC);
+ CAST_OBJ_NOTNULL(wp, (void*)ke[j].udata, WAITED_MAGIC);
Lck_Lock(&vwk->mtx);
AN(Wait_HeapDelete(w, wp));
Lck_Unlock(&vwk->mtx);
More information about the varnish-commit
mailing list