ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* commit 'a866e5a8eb0d331c5970ee106cf8f5bd0903eb7c':
  Fix windows-specific error without messing up Makefile flags.
This commit is contained in:
Stephen Hines 2014-10-02 13:38:33 +00:00 • committed by Android Git Automerger
commit 0d8b1bdcce
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 endif
LOCAL_CFLAGS += -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter -Werror 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_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
LOCAL_MODULE := adb LOCAL_MODULE := adb
LOCAL_MODULE_TAGS := debug LOCAL_MODULE_TAGS := debug

2
adb/sysdeps.h
View file

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

2
adb/sysdeps_win32.c
View file

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

1
adb/usb_windows.c
View file

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