diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2018-06-11 16:33:15 -0700 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2018-06-11 16:33:15 -0700 |
| commit | dddf20793269a7ba5f658ae5fdcde2c175cf196b (patch) | |
| tree | 595d0fbc0c501132857b63f00f073ec6a0f54f58 /src/core/lib/iomgr/ev_epoll1_linux.cc | |
| parent | 935ae7d01242c21f0230ead18927087a70c03e5b (diff) | |
| parent | 37b292a0f7500e434c9ae41919248e2641ddc7f1 (diff) | |
Merge branch 'master' into epollerr
Diffstat (limited to 'src/core/lib/iomgr/ev_epoll1_linux.cc')
| -rw-r--r-- | src/core/lib/iomgr/ev_epoll1_linux.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc index 554522598c..98ab974057 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -1264,12 +1264,12 @@ const grpc_event_engine_vtable* grpc_init_epoll1_linux(bool explicit_request) { } #else /* defined(GRPC_LINUX_EPOLL) */ -#if defined(GRPC_POSIX_SOCKET) +#if defined(GRPC_POSIX_SOCKET_EV_EPOLL1) #include "src/core/lib/iomgr/ev_epoll1_linux.h" /* If GRPC_LINUX_EPOLL is not defined, it means epoll is not available. Return * NULL */ const grpc_event_engine_vtable* grpc_init_epoll1_linux(bool explicit_request) { return nullptr; } -#endif /* defined(GRPC_POSIX_SOCKET) */ +#endif /* defined(GRPC_POSIX_SOCKET_EV_EPOLL1) */ #endif /* !defined(GRPC_LINUX_EPOLL) */ |