From: Tom Peters (thopeter) <thopeter@cisco.com>
Date: Fri, 25 May 2018 18:56:56 +0000 (-0400)
Subject: Merge pull request #1239 in SNORT/snort3 from unit_fix to master
X-Git-Tag: 3.0.0-246~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f1c7caca959a04ee4875b60a95aa86d4894c5753;p=thirdparty%2Fsnort3.git

Merge pull request #1239 in SNORT/snort3 from unit_fix to master

Squashed commit of the following:

commit 1b2a5a61f54118524a5a86a3ae83d55a1239c7d8
Author: Tom Peters <thopeter@cisco.com>
Date:   Thu May 24 14:16:36 2018 -0400

    tcp_connector_test: fixed version-sensitive build problem
---

diff --git a/src/connectors/tcp_connector/test/tcp_connector_test.cc b/src/connectors/tcp_connector/test/tcp_connector_test.cc
index faebd00af..c99a0af64 100644
--- a/src/connectors/tcp_connector/test/tcp_connector_test.cc
+++ b/src/connectors/tcp_connector/test/tcp_connector_test.cc
@@ -132,10 +132,17 @@ ssize_t recv (int, void *buf, size_t n, int)
         return 0;
 }
 
-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; } 
-int accept (int, struct sockaddr*, socklen_t*) { return s_accept_return; } 
+#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
+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; }
+#endif
+
+int accept (int, struct sockaddr*, socklen_t*) { return s_accept_return; }
 int close (int) { return 0; }
 
 static void set_normal_status()