commit 5277ad5a23212f29aa50faa83521419722d2d949
author David Monahan <david.monahan@arm.com> Wed Jan 22 15:40:34 2020 +0000
committer David Monahan <david.monahan@arm.com> Wed Jan 22 15:40:34 2020 +0000
tree 3d97b9ed12c9785163ea1c1e8db36941c3e9b4d8
parent bdee4267583a7daaf9ea5284d2ff6d4bbb782229

Add check to NetworkSockets.cpp to fix failing Android build

Signed-off-by: David Monahan <david.monahan@arm.com>
Change-Id: Ieaa91fae464047c6eeff557b4e01dac09653473d

src/armnnUtils/NetworkSockets.cpp

diff --git a/src/armnnUtils/NetworkSockets.cpp b/src/armnnUtils/NetworkSockets.cpp
index cc28a90..aa9164e 100644
--- a/src/armnnUtils/NetworkSockets.cpp
+++ b/src/armnnUtils/NetworkSockets.cpp
@@ -66,9 +66,11 @@
 #endif
 }
 
-int Ioctl(Socket s, unsigned long cmd, void* arg)
+int Ioctl(Socket s, unsigned long int cmd, void* arg)
 {
-#if defined(__unix__)
+#if defined(__ANDROID__)
+    return ioctl(s, static_cast<int>(cmd), arg);
+#elif defined(__unix__)
     return ioctl(s, cmd, arg);
 #elif defined(_MSC_VER)
     return ioctlsocket(s, cmd, static_cast<u_long*>(arg));
@@ -76,7 +78,7 @@
 }
 
 
-int Poll(PollFd* fds, size_t numFds, int timeout)
+int Poll(PollFd* fds, nfds_t numFds, int timeout)
 {
 #if defined(__unix__)
     return poll(fds, numFds, timeout);

src/armnnUtils/NetworkSockets.hpp

diff --git a/src/armnnUtils/NetworkSockets.hpp b/src/armnnUtils/NetworkSockets.hpp
index 9e47707..8b19290 100644
--- a/src/armnnUtils/NetworkSockets.hpp
+++ b/src/armnnUtils/NetworkSockets.hpp
@@ -49,9 +49,9 @@
 
 long Read(Socket s, void* buf, size_t len);
 
-int Ioctl(Socket s, unsigned long cmd, void* arg);
+int Ioctl(Socket s, unsigned long int cmd, void* arg);
 
-int Poll(PollFd* fds, size_t numFds, int timeout);
+int Poll(PollFd* fds, nfds_t numFds, int timeout);
 
 Socket Accept(Socket s, sockaddr* addr, unsigned int* addrlen, int flags);