Fix Windows adb build.
Change-Id: I560bedfcf77556b36acadc19f5dac71b3628ea2b
This commit is contained in:
parent
9a525d7f2e
commit
6795cd8db5
|
@ -542,14 +542,6 @@ void handle_packet(apacket *p, atransport *t)
|
|||
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)
|
||||
|
|
|
@ -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. */
|
||||
|
|
|
@ -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 @@ static void adb_cleanup(void)
|
|||
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>
|
||||
|
|
Loading…
Reference in New Issue