[HICN-257] facemgr for android

Signed-off-by: Angelo Mantellini <manangel@cisco.com>
Change-Id: I2281def568d1faa1093dce81badab6a95fb03a57

diff --git a/ctrl/facemgr/src/face.c b/ctrl/facemgr/src/face.c
index 7da2550..270a6fa 100644 (file)
--- a/ctrl/facemgr/src/face.c
+++ b/ctrl/facemgr/src/face.c
@@ -26,6 +26,10 @@
 #include "util/hash.h"
 #include "util/token.h"
 
+#ifndef bzero
+#define bzero(b,len) (memset((b), '\0', (len)), (void) 0)
+#endif
+
 #define member_size(type, member) sizeof(((type *)0)->member)
 
 

diff --git a/ctrl/facemgr/src/util/ip_address.h b/ctrl/facemgr/src/util/ip_address.h
index 1653947..243ce04 100644 (file)
--- a/ctrl/facemgr/src/util/ip_address.h
+++ b/ctrl/facemgr/src/util/ip_address.h
@@ -27,6 +27,9 @@
 #include <machine/endian.h>
 #else
 #include <endian.h>
+#ifdef __ANDROID__
+#include <byteswap.h>
+#endif
 #endif
 #include <errno.h>
 #include <netdb.h> // struct addrinfo
@@ -87,7 +90,11 @@ typedef struct {
 /* No htonl() with const */
 static const ip_address_t IPV4_LOOPBACK = {
 #if __BYTE_ORDER == __LITTLE_ENDIAN
+#ifdef __ANDROID__
+    .v4.as_inaddr.s_addr = bswap_32(INADDR_LOOPBACK),
+#else
     .v4.as_inaddr.s_addr = __bswap_constant_32(INADDR_LOOPBACK),
+#endif
 #else
     .v4.as_inaddr.s_addr = INADDR_LOOPBACK,
 #endif