diff options
author | Ghislain Putois <ghpu@infonie.fr> | 2011-08-15 19:39:21 +0200 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2011-08-15 19:39:21 +0200 |
commit | 85851d312771f043263257bcf972bd11cadec50a (patch) | |
tree | 71ac412f2fcaa1d822e15094615a7beabeb697b4 /src/ip.cpp | |
parent | 0354d4d37fe814b9dbb94415da2c5314c4b68ae6 (diff) |
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>
Diffstat (limited to 'src/ip.cpp')
-rw-r--r-- | src/ip.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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; } |