commit ba9765b05869f7783e55f9c6ee66b191898f563a
author Josh Gao <jmgao@google.com> Sat Feb 13 01:32:02 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Feb 13 01:32:02 2016 +0000
tree 76e3a90863827660dcb50945576dbe4fe9b38a5b
parent 42b28f0e4b8f55ee57e6b250b0253a1d5fe2e6d1
parent b69d878b9a3967b247df30dc6f8a760f720659b7

Merge "minadbd: update for adb_thread_create signature change."
am: b69d878b9a

* commit 'b69d878b9a3967b247df30dc6f8a760f720659b7':
  minadbd: update for adb_thread_create signature change.

minadbd/services.cpp

diff --git a/minadbd/services.cpp b/minadbd/services.cpp
index d25648f..658a43f 100644
--- a/minadbd/services.cpp
+++ b/minadbd/services.cpp
@@ -35,11 +35,10 @@
     void *cookie;
 };
 
-void* service_bootstrap_func(void* x) {
+void service_bootstrap_func(void* x) {
     stinfo* sti = reinterpret_cast<stinfo*>(x);
     sti->func(sti->fd, sti->cookie);
     free(sti);
-    return 0;
 }
 
 static void sideload_host_service(int sfd, void* data) {