From: Emmanuel Hocdet <manu@gandi.net>
Date: Thu, 19 Sep 2019 11:08:26 +0000 (+0000)
Subject: BUG/MINOR: build: fix event ports (Solaris)
X-Git-Tag: v2.1-dev2~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ceb96be720352d673f4654fb51210801314b049;p=thirdparty%2Fhaproxy.git

BUG/MINOR: build: fix event ports (Solaris)

Patch 6b308985 "MEDIUM: fd: do not use the FD_POLL_* flags in the
pollers anymore" break ev_evports.c build. Restore variable name
to fix it.
---

diff --git a/src/ev_evports.c b/src/ev_evports.c
index e734b220ed..bde617d5f2 100644
--- a/src/ev_evports.c
+++ b/src/ev_evports.c
@@ -241,10 +241,10 @@ REGPRM3 static void _do_poll(struct poller *p, int exp, int wake)
 		/*
 		 * Set bits based on the events we received from the port:
 		 */
-		n = ((e & POLLIN)    ? FD_EV_READY_R : 0) |
-		    ((e & POLLOUT)   ? FD_EV_READY_W : 0) |
-		    ((e & POLLHUP)   ? FD_EV_SHUT_RW : 0) |
-		    ((e & POLLERR)   ? FD_EV_ERR_RW  : 0);
+		n = ((events & POLLIN)  ? FD_EV_READY_R : 0) |
+		    ((events & POLLOUT) ? FD_EV_READY_W : 0) |
+		    ((events & POLLHUP) ? FD_EV_SHUT_RW : 0) |
+		    ((events & POLLERR) ? FD_EV_ERR_RW  : 0);
 
 		/*
 		 * Call connection processing callbacks.  Note that it's