]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
tcp: Fixed includes for FreeBSD.
authormacrule <562520+macrule@users.noreply.github.com>
Wed, 29 Nov 2017 17:18:53 +0000 (18:18 +0100)
committerJaroslav Kysela <perex@perex.cz>
Sun, 10 Dec 2017 15:14:24 +0000 (16:14 +0100)
sys/socket.h is required.

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

src/tcp.c
src/tcp.h

index ed057812fadf673cbbe59d1a0521a80fcf986953..4ef68fa685c98c4e216e42e66dcbdffa2b6b0d92 100644 (file)
--- 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>
 
index 64463bb71f5270d042d8283b0d4450f00a8980e4..84ed04c476b11b2b584e2b285617f7949a57d417 100644 (file)
--- a/src/tcp.h
+++ b/src/tcp.h
 #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) \