From: macrule <562520+macrule@users.noreply.github.com>
Date: Wed, 29 Nov 2017 17:18:53 +0000 (+0100)
Subject: tcp: Fixed includes for FreeBSD.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad5a4842de965ce53cfb29f564ff1e34028829e7;p=thirdparty%2Ftvheadend.git

tcp: Fixed includes for FreeBSD.

sys/socket.h is required.

Switched include order for netinet/in.h and netinet/ip.h to avoid compiler errors on FreeBSD.
---

diff --git a/src/tcp.c b/src/tcp.c
index 31341c28d..5bd214940 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -30,8 +30,8 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <signal.h>
-#include <netinet/ip.h>
 #include <netinet/in.h>
+#include <netinet/ip.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <sys/types.h>
diff --git a/src/tcp.h b/src/tcp.h
index 1c786d0cb..ad6ef018f 100644
--- a/src/tcp.h
+++ b/src/tcp.h
@@ -22,6 +22,10 @@
 #include "htsbuf.h"
 #include "htsmsg.h"
 
+#if defined(PLATFORM_FREEBSD)
+#include <sys/socket.h>
+#endif
+
 #define IP_AS_V4(storage, f) ((struct sockaddr_in *)&(storage))->sin_##f
 #define IP_AS_V6(storage, f) ((struct sockaddr_in6 *)&(storage))->sin6_##f
 #define IP_IN_ADDR(storage) \