commit ee7d15a6e4dcfe5fa2996d7aee263adeea8b6736
author Lorenzo Colitti <lorenzo@google.com> Thu Jun 04 14:55:58 2009 -0700
committer Lorenzo Colitti <lorenzo@google.com> Thu Jun 04 14:55:58 2009 -0700
tree 4bdaaf3ed932ad59f6401579309c9d6a1c80e69a
parent 3361e3c0280a7c5b7e1a10c74558bca331a892a5

Unbreak sim build.

libcore/luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.cpp

diff --git a/libcore/luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.cpp b/libcore/luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.cpp
index bd2f336..f760294 100644
--- a/libcore/luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.cpp
+++ b/libcore/luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.cpp
@@ -24,7 +24,12 @@
 #include <stdio.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+// Temporary hack to fix the sim build until bionic is updated.
+#ifdef HAVE_ANDROID_OS
 #include <netinet/in6.h>
+#else
+#define ipv6mr_ifindex ipv6mr_interface
+#endif
 #include <netinet/tcp.h>
 #include <netdb.h>
 #include <sys/time.h>
@@ -3210,7 +3215,8 @@
     // LOGD("ENTER setSocketOptionImpl");
 
     int handle, result;
-    int intVal, intSize = sizeof(int);
+    int intVal;
+    socklen_t intSize = sizeof(int);
     unsigned char byteVal;
     socklen_t byteSize = sizeof(unsigned char);
     struct sockaddr_storage sockVal;