From b21a08ea034458591b42f2f1d4f95d12d7c461b2 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Thu, 14 Jan 2021 18:44:12 +0100 Subject: [PATCH] Fix compile error introduced by bad cherry-pick in a7e8a33833e14ccc8f0bc992d97b800bc3014f89 --- transport-native-epoll/src/main/c/netty_epoll_native.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/transport-native-epoll/src/main/c/netty_epoll_native.c b/transport-native-epoll/src/main/c/netty_epoll_native.c index a6b8b394f5..0282795421 100644 --- a/transport-native-epoll/src/main/c/netty_epoll_native.c +++ b/transport-native-epoll/src/main/c/netty_epoll_native.c @@ -540,9 +540,7 @@ static const JNINativeMethod fixed_method_table[] = { // "sendmmsg0" has a dynamic signature { "sizeofEpollEvent", "()I", (void *) netty_epoll_native_sizeofEpollEvent }, { "offsetofEpollData", "()I", (void *) netty_epoll_native_offsetofEpollData }, - { "registerUnix", "()I", (void *) netty_epoll_native_registerUnix }, - ->>>>>>> 5b41f3d25b... Ensure native methods for unix-native-common are only registered once. (#10932) + { "registerUnix", "()I", (void *) netty_epoll_native_registerUnix } }; static const jint fixed_method_table_size = sizeof(fixed_method_table) / sizeof(fixed_method_table[0]);