openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 0d8b1bdc: am a866e5a8: am 6cf1193b: am 2f431a8d: Fix windows-specific error without messing up Makefile flags. 

* commit '0d8b1bdcce553a60fb9112ca403c00ad9d8842a5':
  Fix windows-specific error without messing up Makefile flags.
This commit is contained in:
Stephen Hines 2014-10-02 13:53:01 +00:00 committed by Android Git Automerger
parent f1ee5cd0ad 0d8b1bdcce
commit f39f24df24
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
adb/Android.mk
View File

@ -74,9 +74,6 @@ else
endif
LOCAL_CFLAGS += -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter -Werror
ifeq ($(HOST_OS),windows)
LOCAL_CFLAGS += -Wno-error=cpp
endif
LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
LOCAL_MODULE := adb
LOCAL_MODULE_TAGS := debug

2
adb/sysdeps.h
View File

@ -26,8 +26,8 @@
#ifdef _WIN32
#include <windows.h>
#include <winsock2.h>
#include <windows.h>
#include <ws2tcpip.h>
#include <process.h>
#include <fcntl.h>

2
adb/sysdeps_win32.c
View File

@ -1,6 +1,6 @@
#include "sysdeps.h"
#include <windows.h>
#include <winsock2.h>
#include <windows.h>
#include <stdio.h>
#include <errno.h>
#define TRACE_TAG TRACE_SYSDEPS

1
adb/usb_windows.c
View File

@ -14,6 +14,7 @@
* limitations under the License.
*/
#include <winsock2.h>
#include <windows.h>
#include <winerror.h>
#include <errno.h>