commit 18daa159ec5f8455f83dd87dad1a1ed1d2501b3e
author Dan Albert <danalbert@google.com> Thu Feb 19 20:33:31 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 19 20:33:31 2015 +0000
tree 758bc1a42b39916d7607cd5ff707a382e8957173
parent 63feeaaa0608e63969f434456ddaa32bf85bd220
parent 13f9c406d7ae58bb3f5c3ac0b0e50f8760c5cf46

Merge "Document the behavior of props affecting adb root."

adb/adb.c

diff --git a/adb/adb.c b/adb/adb.c
index f15902b..d1f05e4 100644
--- a/adb/adb.c
+++ b/adb/adb.c
@@ -542,14 +542,6 @@
     put_apacket(p);
 }
 
-#if defined(_WIN32)
-static BOOL WINAPI ctrlc_handler(DWORD type)
-{
-    exit(STATUS_CONTROL_C_EXIT);
-    return TRUE;
-}
-#endif
-
 #if ADB_HOST
 
 int launch_server(int server_port)

adb/adb_listeners.c

diff --git a/adb/adb_listeners.c b/adb/adb_listeners.c
index e9d3c22..76a03eb 100644
--- a/adb/adb_listeners.c
+++ b/adb/adb_listeners.c
@@ -16,8 +16,6 @@
 
 #include "adb_listeners.h"
 
-#include <sys/socket.h>
-
 #include "sysdeps.h"
 
 int gListenAll = 0; /* Not static because it is used in commandline.c. */

adb/adb_main.c

diff --git a/adb/adb_main.c b/adb/adb_main.c
index d53a61f..02acae2 100644
--- a/adb/adb_main.c
+++ b/adb/adb_main.c
@@ -20,7 +20,6 @@
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/prctl.h>
 
 #include "adb.h"
 #include "adb_auth.h"
@@ -29,6 +28,7 @@
 
 #if !ADB_HOST
 #include <getopt.h>
+#include <sys/prctl.h>
 
 #include "cutils/properties.h"
 #include "private/android_filesystem_config.h"
@@ -42,6 +42,14 @@
     usb_cleanup();
 }
 
+#if defined(_WIN32)
+static BOOL WINAPI ctrlc_handler(DWORD type)
+{
+    exit(STATUS_CONTROL_C_EXIT);
+    return TRUE;
+}
+#endif
+
 #if ADB_HOST
 #ifdef WORKAROUND_BUG6558362
 #include <sched.h>