From da4513b557c9d0505a968e02048f51a589f905b8 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 13 Jan 2019 21:19:52 +0000
Subject: [PATCH] scst: Fix RHEL 7.6 'EPOLLHUP undeclared' build error (merge
 r7843 from trunk)

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7884 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scst/include/backport.h | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/scst/include/backport.h b/scst/include/backport.h
index 71f689efe..4b2712bcb 100644
--- a/scst/include/backport.h
+++ b/scst/include/backport.h
@@ -310,24 +310,46 @@ typedef unsigned int __poll_t;
 #define EPOLLNVAL	POLLNVAL
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) && !defined(EPOLLIN)
 /*
  * See also commit 7e040726850a ("eventpoll.h: add missing epoll event masks").
  * Note: this commit got backported to multiple stable kernels, including
  * v3.18.93.
  */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+#if !defined(EPOLLIN)
 #define EPOLLIN		POLLIN
+#endif
+#if !defined(EPOLLPRI)
 #define EPOLLPRI	POLLPRI
+#endif
+#if !defined(EPOLLOUT)
 #define EPOLLOUT	POLLOUT
+#endif
+#if !defined(EPOLLERR)
 #define EPOLLERR	POLLERR
+#endif
+#if !defined(EPOLLHUP)
 #define EPOLLHUP	POLLHUP
+#endif
+#if !defined(EPOLLRDNORM)
 #define EPOLLRDNORM	POLLRDNORM
+#endif
+#if !defined(EPOLLRDBAND)
 #define EPOLLRDBAND	POLLRDBAND
+#endif
+#if !defined(EPOLLWRNORM)
 #define EPOLLWRNORM	POLLWRNORM
+#endif
+#if !defined(EPOLLWRBAND)
 #define EPOLLWRBAND	POLLWRBAND
+#endif
+#if !defined(EPOLLMSG)
 #define EPOLLMSG	POLLMSG
+#endif
+#if !defined(EPOLLRDHUP)
 #define EPOLLRDHUP	POLLRDHUP
 #endif
+#endif
 
 /* <linux/fs.h> */