From c23ca441d8c20c4b781b67148554428977034bce Mon Sep 17 00:00:00 2001
From: Nikolaus Klepp <office@klepp.biz>
Date: Tue, 5 May 2015 21:47:07 +0200
Subject: [PATCH] Fix FTBFS on freebsd This resolves Bug 2428

Signed-off-by: Nikolaus Klepp <office@klepp.biz>
(cherry picked from commit 31a6127eecfb7d905939734091f6a7b6379ffc75)
---
 mcop/tcpconnection.cc    | 1 +
 mcop/unixconnection.cc   | 1 +
 mcop/unixserver.cc       | 1 +
 mcop_mt/threads_posix.cc | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mcop/tcpconnection.cc b/mcop/tcpconnection.cc
index e87fde5..722ed2c 100644
--- a/mcop/tcpconnection.cc
+++ b/mcop/tcpconnection.cc
@@ -35,6 +35,7 @@
 #include <errno.h>
 #include "debug.h"
 #include <stdlib.h>
+#include <string.h>
 
 using namespace std;
 using namespace Arts;
diff --git a/mcop/unixconnection.cc b/mcop/unixconnection.cc
index 40247c4..38464d3 100644
--- a/mcop/unixconnection.cc
+++ b/mcop/unixconnection.cc
@@ -29,6 +29,7 @@
 #include <sys/un.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <string.h>
 
 using namespace std;
 using namespace Arts;
diff --git a/mcop/unixserver.cc b/mcop/unixserver.cc
index 9c13ab2..acb3496 100644
--- a/mcop/unixserver.cc
+++ b/mcop/unixserver.cc
@@ -40,6 +40,7 @@
 #include <unistd.h>                                                      
 #include <stdio.h>
 #include <errno.h>
+#include <string.h>
 
 using namespace std;
 using namespace Arts;
diff --git a/mcop_mt/threads_posix.cc b/mcop_mt/threads_posix.cc
index 0a884f9..0ec24a5 100644
--- a/mcop_mt/threads_posix.cc
+++ b/mcop_mt/threads_posix.cc
@@ -358,7 +358,7 @@ static void pth_rec_cond_init (GslCond *cond)
 static void pth_rec_cond_wait_timed (GslCond *cond, GslMutex *mutex,
 									 gulong abs_secs, gulong abs_usecs)
 {
-	struct timespec abstime;
+	struct ::timespec abstime;
 
 	abstime.tv_sec = abs_secs;
 	abstime.tv_nsec = abs_usecs * 1000;