From: E.Smith <31170571+azlm8t@users.noreply.github.com>
Date: Fri, 30 Nov 2018 10:12:08 +0000 (+0000)
Subject: freebsd: Fixup header files for socket definitions. Make thread owner conditional... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=652dbc3c8a58eab427f27ca79065d1e880098f63;p=thirdparty%2Ftvheadend.git

freebsd: Fixup header files for socket definitions. Make thread owner conditional on Linux.
---

diff --git a/src/tcp.c b/src/tcp.c
index a79a886a7..cf500eb2d 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -19,11 +19,11 @@
 #include <fcntl.h>
 #include <poll.h>
 #include <signal.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <ifaddrs.h>
 #include <netdb.h>
diff --git a/src/tvh_thread.c b/src/tvh_thread.c
index 6fc5c0615..1e961f9e7 100644
--- a/src/tvh_thread.c
+++ b/src/tvh_thread.c
@@ -390,7 +390,7 @@ static void tvh_thread_mutex_deadlock(tvh_mutex_t *mutex)
 {
   int fd = hts_settings_open_file(HTS_SETTINGS_OPEN_WRITE | HTS_SETTINGS_OPEN_DIRECT, "mutex-deadlock.txt");
   if (fd < 0) fd = fileno(stderr);
-#if __GLIBC__
+#if defined(PLATFORM_LINUX) && __GLIBC__
   int sid = mutex->mutex.__data.__owner; /* unportable */
 #else
   int sid = -1;
diff --git a/src/wrappers.c b/src/wrappers.c
index 60554dc5f..4cccdfc41 100644
--- a/src/wrappers.c
+++ b/src/wrappers.c
@@ -1,5 +1,7 @@
 #define _GNU_SOURCE
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/socket.h>
 #include <fcntl.h>
 #include "tvheadend.h"
 #include "tvhregex.h"