|
Added
Link Here
|
| 0 |
- |
1 |
# Workaround incompatible kqueue1 after https://reviews.freebsd.org/D39271 |
|
|
2 |
|
| 3 |
--- src/CMakeLists.txt |
| 4 |
+++ src/CMakeLists.txt |
| 5 |
@@ -44,7 +44,6 @@ include(CheckSymbolExists) |
| 6 |
check_symbol_exists(eventfd "sys/eventfd.h" HAVE_EVENTFD) |
| 7 |
check_symbol_exists(timerfd_create "sys/timerfd.h" HAVE_TIMERFD) |
| 8 |
|
| 9 |
-check_symbol_exists(kqueue1 "sys/event.h" HAVE_KQUEUE1) |
| 10 |
add_compat_target(kqueue1 "NOT;HAVE_KQUEUE1") |
| 11 |
check_symbol_exists(sigandset "signal.h" HAVE_SIGANDSET) |
| 12 |
check_symbol_exists(sigorset "signal.h" HAVE_SIGORSET) |
| 13 |
--- src/compat_kqueue1.h |
| 14 |
+++ src/compat_kqueue1.h |
| 15 |
@@ -3,8 +3,4 @@ |
| 16 |
|
| 17 |
int compat_kqueue1(int); |
| 18 |
|
| 19 |
-#ifdef COMPAT_ENABLE_KQUEUE1 |
| 20 |
-#define kqueue1 compat_kqueue1 |
| 21 |
-#endif |
| 22 |
- |
| 23 |
#endif |
| 24 |
--- src/epoll_shim_ctx.c |
| 25 |
+++ src/epoll_shim_ctx.c |
| 26 |
@@ -242,7 +242,7 @@ epoll_shim_ctx_create_desc(EpollShimCtx *epoll_shim_ctx, int flags, /**/ |
| 27 |
|
| 28 |
rwlock_lock_write(&epoll_shim_ctx->rwlock); |
| 29 |
|
| 30 |
- int kq = kqueue1(flags); |
| 31 |
+ int kq = compat_kqueue1(flags); |
| 32 |
if (kq < 0) { |
| 33 |
ec = errno; |
| 34 |
goto out_kqueue; |
| 35 |
--- src/epollfd_ctx.c |
| 36 |
+++ src/epollfd_ctx.c |
| 37 |
@@ -543,7 +543,7 @@ registered_fds_node_register_for_completion(int *kq, |
| 38 |
} |
| 39 |
|
| 40 |
if (*kq < 0) { |
| 41 |
- *kq = kqueue1(O_CLOEXEC); |
| 42 |
+ *kq = compat_kqueue1(O_CLOEXEC); |
| 43 |
} |
| 44 |
|
| 45 |
if (*kq >= 0) { |