From 9ca3821d9a6c8398ed4687816e4382477f78428c Mon Sep 17 00:00:00 2001
From: KIU Shueng Chuan <nixchuan@gmail.com>
Date: Mon, 4 Jun 2018 23:09:23 +0800
Subject: [PATCH 1/2] Problem: incomplete wepoll filelist in Makefile.am

Solution: add them so that they get included in "make dist"
---
 Makefile.am | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 31d7c5fe..b7bd8f9d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -259,7 +259,8 @@ src_libzmq_la_SOURCES = \
 
 if USE_WEPOLL
 src_libzmq_la_SOURCES += \
-	external/wepoll/wepoll.c
+	external/wepoll/wepoll.c \
+	external/wepoll/wepoll.h
 endif
 
 if USE_TWEETNACL
@@ -974,6 +975,9 @@ endif
 EXTRA_DIST = \
 	external/unity/license.txt \
 	external/unity/version.txt \
+	external/wepoll/license.txt \
+	external/wepoll/version.txt \
+	external/wepoll/README.md \
 	CMakeLists.txt \
 	autogen.sh	\
 	version.sh	\

From 5a1ea0c398496b8c8da96c981bac737fc5364823 Mon Sep 17 00:00:00 2001
From: KIU Shueng Chuan <nixchuan@gmail.com>
Date: Mon, 4 Jun 2018 23:17:57 +0800
Subject: [PATCH 2/2] Problem: ZMQ_USE_EPOLL_CLOEXEC not renamed to new name

Solution: rename it
---
 src/epoll.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/epoll.cpp b/src/epoll.cpp
index 91173c51..60c4ad40 100644
--- a/src/epoll.cpp
+++ b/src/epoll.cpp
@@ -54,7 +54,7 @@ const zmq::epoll_t::epoll_fd_t zmq::epoll_t::epoll_retired_fd =
 zmq::epoll_t::epoll_t (const zmq::thread_ctx_t &ctx_) :
     worker_poller_base_t (ctx_)
 {
-#ifdef ZMQ_USE_EPOLL_CLOEXEC
+#ifdef ZMQ_IOTHREAD_POLLER_USE_EPOLL_CLOEXEC
     //  Setting this option result in sane behaviour when exec() functions
     //  are used. Old sockets are closed and don't block TCP ports, avoid
     //  leaks, etc.