From badcc3f56dcd3627d8efc2678e5ad5449225fcb9 Mon Sep 17 00:00:00 2001
From: Finn Williams <Finn.Williams@arm.com>
Date: Fri, 22 May 2020 14:28:15 +0100
Subject: Fix some musl libc issues in armnn

Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: Ifb0295ee4516ca6cbd4364ade418b707fb39b354
---
 profiling/common/src/NetworkSockets.cpp                   | 8 +++++---
 profiling/server/src/basePipeServer/BasePipeServer.cpp    | 1 +
 profiling/server/src/basePipeServer/ConnectionHandler.cpp | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'profiling')

diff --git a/profiling/common/src/NetworkSockets.cpp b/profiling/common/src/NetworkSockets.cpp
index 1e1f70112d..b41cbac43d 100644
--- a/profiling/common/src/NetworkSockets.cpp
+++ b/profiling/common/src/NetworkSockets.cpp
@@ -8,6 +8,8 @@
 #if defined(__unix__)
 #include <unistd.h>
 #include <fcntl.h>
+#include <armnn/Conversion.hpp>
+
 #endif
 
 namespace armnnUtils
@@ -68,10 +70,10 @@ long Read(Socket s, void* buf, size_t len)
 
 int Ioctl(Socket s, unsigned long int cmd, void* arg)
 {
-#if defined(__ANDROID__)
+#if defined(__unix__)
+    ARMNN_NO_CONVERSION_WARN_BEGIN
     return ioctl(s, static_cast<int>(cmd), arg);
-#elif defined(__unix__)
-    return ioctl(s, cmd, arg);
+    ARMNN_NO_CONVERSION_WARN_END
 #elif defined(_MSC_VER)
     return ioctlsocket(s, cmd, static_cast<u_long*>(arg));
 #endif
diff --git a/profiling/server/src/basePipeServer/BasePipeServer.cpp b/profiling/server/src/basePipeServer/BasePipeServer.cpp
index 7e8789aa2a..ed5c442492 100644
--- a/profiling/server/src/basePipeServer/BasePipeServer.cpp
+++ b/profiling/server/src/basePipeServer/BasePipeServer.cpp
@@ -11,6 +11,7 @@
 #include <boost/cast.hpp>
 #include <vector>
 #include <iomanip>
+#include <string.h>
 
 using namespace armnnUtils;
 
diff --git a/profiling/server/src/basePipeServer/ConnectionHandler.cpp b/profiling/server/src/basePipeServer/ConnectionHandler.cpp
index 69ccd01050..1485ab8620 100644
--- a/profiling/server/src/basePipeServer/ConnectionHandler.cpp
+++ b/profiling/server/src/basePipeServer/ConnectionHandler.cpp
@@ -4,6 +4,8 @@
 //
 #include "ConnectionHandler.hpp"
 
+#include <string.h>
+
 using namespace armnnUtils;
 
 namespace armnnProfiling
-- 
cgit v1.2.1