From 6da6a45d09ac8d7ea956c09ba241c9e0840ecb25 Mon Sep 17 00:00:00 2001
From: Jim Flynn <jim.flynn@arm.com>
Date: Tue, 14 Jul 2020 14:26:27 +0100
Subject: Make it build on MACOSX

Still need to explicitly defined
-DCMAKE_CXX_FLAGS=--std=c++14
which that flags should goes into CMakefile.txt

JF: Fixed merge failure by removing Filesystem.cpp
    and updated the copyright headers to new standard

Change-Id: I6d0886bd86bc1ddb593028194852551d43c77745
Signed-off-by: Keith Mok <ek9852@gmail.com>
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
---
 profiling/common/include/NetworkSockets.hpp | 10 ++++++++--
 profiling/common/src/NetworkSockets.cpp     | 18 ++++++++++--------
 2 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'profiling')

diff --git a/profiling/common/include/NetworkSockets.hpp b/profiling/common/include/NetworkSockets.hpp
index b970424e10..05a45ae90b 100644
--- a/profiling/common/include/NetworkSockets.hpp
+++ b/profiling/common/include/NetworkSockets.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright © 2020 Arm Ltd. All rights reserved.
+// Copyright © 2020 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#if defined(__unix__)
+#if defined(__unix__) || defined(__APPLE__)
 #include <poll.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
@@ -31,6 +31,12 @@ namespace Sockets
 using Socket = int;
 using PollFd = pollfd;
 
+#elif defined(__APPLE__)
+
+using Socket = int;
+using PollFd = pollfd;
+#define SOCK_CLOEXEC 0
+
 #elif defined(_MSC_VER)
 
 using Socket = SOCKET;
diff --git a/profiling/common/src/NetworkSockets.cpp b/profiling/common/src/NetworkSockets.cpp
index 3ae0644a0b..7f47c79b31 100644
--- a/profiling/common/src/NetworkSockets.cpp
+++ b/profiling/common/src/NetworkSockets.cpp
@@ -5,7 +5,7 @@
 
 #include "common/include/NetworkSockets.hpp"
 
-#if defined(__unix__)
+#if defined(__unix__) || defined(__APPLE__)
 #include <unistd.h>
 #include <fcntl.h>
 #include <armnn/Conversion.hpp>
@@ -19,7 +19,7 @@ namespace Sockets
 
 bool Initialize()
 {
-#if defined(__unix__)
+#if defined(__unix__) || defined(__APPLE__)
     return true;
 #elif defined(_MSC_VER)
     WSADATA wsaData;
@@ -29,7 +29,7 @@ bool Initialize()
 
 int Close(Socket s)
 {
-#if defined(__unix__)
+#if defined(__unix__) || defined(__APPLE__)
     return close(s);
 #elif defined(_MSC_VER)
     return closesocket(s);
@@ -39,7 +39,7 @@ int Close(Socket s)
 
 bool SetNonBlocking(Socket s)
 {
-#if defined(__unix__)
+#if defined(__unix__) || defined(__APPLE__)
     const int currentFlags = fcntl(s, F_GETFL);
     return fcntl(s, F_SETFL, currentFlags | O_NONBLOCK) == 0;
 #elif defined(_MSC_VER)
@@ -51,7 +51,7 @@ bool SetNonBlocking(Socket s)
 
 long Write(Socket s, const void* buf, size_t len)
 {
-#if defined(__unix__)
+#if defined(__unix__) || defined(__APPLE__)
     return write(s, buf, len);
 #elif defined(_MSC_VER)
     return send(s, static_cast<const char*>(buf), static_cast<int>(len), 0);
@@ -61,7 +61,7 @@ long Write(Socket s, const void* buf, size_t len)
 
 long Read(Socket s, void* buf, size_t len)
 {
-#if defined(__unix__)
+#if defined(__unix__) || defined(__APPLE__)
     return read(s, buf, len);
 #elif defined(_MSC_VER)
     return recv(s, static_cast<char*>(buf), static_cast<int>(len), 0);
@@ -70,7 +70,7 @@ long Read(Socket s, void* buf, size_t len)
 
 int Ioctl(Socket s, unsigned long int cmd, void* arg)
 {
-#if defined(__unix__)
+#if defined(__unix__) || defined(__APPLE__)
     ARMNN_NO_CONVERSION_WARN_BEGIN
     return ioctl(s, static_cast<int>(cmd), arg);
     ARMNN_NO_CONVERSION_WARN_END
@@ -82,7 +82,7 @@ int Ioctl(Socket s, unsigned long int cmd, void* arg)
 
 int Poll(PollFd* fds, nfds_t numFds, int timeout)
 {
-#if defined(__unix__)
+#if defined(__unix__) || defined(__APPLE__)
     return poll(fds, numFds, timeout);
 #elif defined(_MSC_VER)
     return WSAPoll(fds, numFds, timeout);
@@ -94,6 +94,8 @@ armnnUtils::Sockets::Socket Accept(Socket s, sockaddr* addr, socklen_t* addrlen,
 {
 #if defined(__unix__)
     return accept4(s, addr, addrlen, flags);
+#elif defined(__APPLE__)
+    return accept(s, addr, addrlen);
 #elif defined(_MSC_VER)
     return accept(s, addr, reinterpret_cast<int*>(addrlen));
 #endif
-- 
cgit v1.2.1