From 85851d312771f043263257bcf972bd11cadec50a Mon Sep 17 00:00:00 2001
From: Ghislain Putois <ghpu@infonie.fr>
Date: Mon, 15 Aug 2011 19:39:21 +0200
Subject: Preliminary Android support

Some small changes to prepare a cross-compilation for the Android platform

Signed-off-by: Ghislain Putois <ghpu@infonie.fr>
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
---
 src/ip.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/ip.cpp')

diff --git a/src/ip.cpp b/src/ip.cpp
index 4bacff3..953640d 100644
--- a/src/ip.cpp
+++ b/src/ip.cpp
@@ -106,7 +106,7 @@ static int resolve_nic_name (struct sockaddr* addr_, char const *interface_,
     return 0;
 }
 
-#elif defined ZMQ_HAVE_AIX || ZMQ_HAVE_HPUX
+#elif defined ZMQ_HAVE_AIX || ZMQ_HAVE_HPUX || ZMQ_HAVE_ANDROID
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -139,8 +139,9 @@ static int resolve_nic_name (struct sockaddr* addr_, char const *interface_,
         return -1;
     }
 
-    struct sockaddr *sa = (struct sockaddr *) &ifr.ifr_addr;
-    *addr_ = ((sockaddr_in*)sa)->sin_addr;
+    memcpy (&((sockaddr_in*) addr_)->sin_addr,
+        &((sockaddr_in*) &ifr.ifr_addr)->sin_addr, sizeof (in_addr));
+
     return 0;    
 }
 
-- 
cgit v1.2.3