Merge pull request #348 from vlovich/fix-android-build

Add missing include when building on Linux

c++/CMakeLists.txt

@@ -63,7 +63,11 @@ else()
   #
   # We have to use -std=gnu++0x isntead of -std=c++11 because otherwise we lose
   # GNU extensions that we need.
-  add_compile_options(-std=gnu++0x -Wall -Wextra -Wno-strict-aliasing -Wno-sign-compare -Wno-unused-parameter -pthread)
+  add_compile_options(-std=gnu++0x -Wall -Wextra -Wno-strict-aliasing -Wno-sign-compare -Wno-unused-parameter)
+
+  if (NOT ANDROID)
+    add_compile_options(-pthread)
+  endif()
 endif()
 
 # Source =======================================================================

c++/src/kj/CMakeLists.txt

@@ -58,7 +58,7 @@ set(kj-std_headers
 )
 add_library(kj ${kj_sources})
 add_library(CapnProto::kj ALIAS kj)
-if(UNIX)
+if(UNIX AND NOT ANDROID)
   target_link_libraries(kj PUBLIC pthread)
 endif()
 #make sure the lite flag propagates to all users (internal + external) of this library

c++/src/kj/async-io.c++

@@ -1229,7 +1229,7 @@ public:
         // OK, we know the cmsghdr is valid, at least.
 
         // Find the start of the message payload.
-        const byte* begin = CMSG_DATA(cmsg);
+        const byte* begin = (const byte *)CMSG_DATA(cmsg);
 
         // Cap the message length to the available space.
         const byte* end = pos + kj::min(available, cmsg->cmsg_len);

c++/src/kj/miniposix.h

@@ -44,6 +44,10 @@
 #include <sys/types.h>
 #endif
 
+#if !_WIN32
+#include <sys/uio.h>
+#endif
+
 namespace kj {
 namespace miniposix {