generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-13 10:52:56 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3155 from pijyoi/wepoll_missing_files

Browse Source 
wepoll integration fixes
This commit is contained in:
Luca Boccassi 2018-06-04 17:14:38 +01:00 committed by GitHub
commit aee5fc2560
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -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 \

2
src/epoll.cpp
View File

@ -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.