From: Ted Bedwell <tebedwel@cisco.com>
Date: Tue, 9 Oct 2018 17:41:25 +0000 (-0400)
Subject: connectors: Fix TCP connector unit test compilation on Alpine Linux (musl)
X-Git-Tag: 3.0.0-249~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1cfd7ccfcb0b173e4cc11e98b72e4c019b069c9;p=thirdparty%2Fsnort3.git

connectors: Fix TCP connector unit test compilation on Alpine Linux (musl)
---

diff --git a/src/connectors/tcp_connector/test/tcp_connector_test.cc b/src/connectors/tcp_connector/test/tcp_connector_test.cc
index f4c4036ee..f1d2c21ff 100644
--- a/src/connectors/tcp_connector/test/tcp_connector_test.cc
+++ b/src/connectors/tcp_connector/test/tcp_connector_test.cc
@@ -27,7 +27,7 @@
 #include "connectors/tcp_connector/tcp_connector_module.h"
 
 #include <netdb.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/socket.h>
 #include <unistd.h>
 
@@ -135,14 +135,14 @@ ssize_t recv (int, void *buf, size_t n, int)
         return 0;
 }
 
-#ifdef __FreeBSD__
-int socket (int, int, int) { return s_socket_return; }
-int bind (int, const struct sockaddr*, socklen_t) { return s_bind_return; }
-int listen (int, int) { return s_listen_return; }
-#else
+#ifdef __GLIBC__
 int socket (int, int, int) __THROW { return s_socket_return; }
 int bind (int, const struct sockaddr*, socklen_t) __THROW { return s_bind_return; }
 int listen (int, int) __THROW { return s_listen_return; }
+#else
+int socket (int, int, int) { return s_socket_return; }
+int bind (int, const struct sockaddr*, socklen_t) { return s_bind_return; }
+int listen (int, int) { return s_listen_return; }
 #endif
 
 int accept (int, struct sockaddr*, socklen_t*) { return s_accept_return; }