diff options
author | Craig Tiller <ctiller@google.com> | 2017-05-05 15:21:19 +0000 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2017-05-05 15:21:19 +0000 |
commit | eda29c639871adb28d688ab8724f9754f2f209fc (patch) | |
tree | ec8437b4244848f1eb1e140d40a8e7e3b2d9bc3d /binding.gyp | |
parent | 7365ec95e439c7a544f97f17b7254dce78e10617 (diff) | |
parent | 5c53d1bd0af5b4d2cd79255b7d65329a2c0b65c9 (diff) |
Merge branch 'epex4' into uberpoll
Diffstat (limited to 'binding.gyp')
-rw-r--r-- | binding.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/binding.gyp b/binding.gyp index 5b58838b04..1abbdd1a59 100644 --- a/binding.gyp +++ b/binding.gyp @@ -675,6 +675,7 @@ 'src/core/lib/iomgr/endpoint_pair_windows.c', 'src/core/lib/iomgr/error.c', 'src/core/lib/iomgr/ev_epoll1_linux.c', + 'src/core/lib/iomgr/ev_epollex_linux.c', 'src/core/lib/iomgr/ev_epollsig_linux.c', 'src/core/lib/iomgr/ev_poll_posix.c', 'src/core/lib/iomgr/ev_posix.c', @@ -685,6 +686,7 @@ 'src/core/lib/iomgr/iomgr_posix.c', 'src/core/lib/iomgr/iomgr_uv.c', 'src/core/lib/iomgr/iomgr_windows.c', + 'src/core/lib/iomgr/is_epollexclusive_available.c', 'src/core/lib/iomgr/load_file.c', 'src/core/lib/iomgr/lockfree_event.c', 'src/core/lib/iomgr/network_status_tracker.c', |