Merge branch 'tcpserv' of https://github.com/tux3/toxcore

1 files changed, 3 insertions, 2 deletions

diff --git a/toxcore/TCP_server.c b/toxcore/TCP_server.c
index b900db6b..5652513e 100644
--- a/toxcore/TCP_server.c
+++ b/toxcore/TCP_server.c
@@ -818,9 +818,10 @@ static sock_t new_listening_TCP_socket(int family, uint16_t port)
         return ~0;
     }
 
-    int ok = 1;
 #ifndef TCP_SERVER_USE_EPOLL
-    ok = set_socket_nonblock(sock);
+    int ok = set_socket_nonblock(sock);
+#else
+    int ok = 1;
 #endif
 
     if (ok && family == AF_INET6) {