diff options
| author | Stephen Hines <srhines@google.com> | 2014-10-01 23:21:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-01 23:21:09 +0000 |
| commit | 1e95e0b19cd265088286940def38d27305f847af (patch) | |
| tree | b33220a5c293400ba785a6fa49bc647a550eb93d | |
| parent | 0188733e426695f1cf6090d4c51f2652e68eb51a (diff) | |
| parent | 64f44b8444dabd69cf391d42e10d44e8e926a79d (diff) | |
| download | system_core-1e95e0b19cd265088286940def38d27305f847af.zip system_core-1e95e0b19cd265088286940def38d27305f847af.tar.gz system_core-1e95e0b19cd265088286940def38d27305f847af.tar.bz2 | |
am 64f44b84: Merge "Remove obsolete reference to ddk; Fixes for -Werror" into lmp-dev
* commit '64f44b8444dabd69cf391d42e10d44e8e926a79d':
Remove obsolete reference to ddk; Fixes for -Werror
| -rw-r--r-- | adb/Android.mk | 4 | ||||
| -rw-r--r-- | adb/commandline.c | 1 | ||||
| -rw-r--r-- | adb/sysdeps.h | 1 | ||||
| -rw-r--r-- | adb/sysdeps_win32.c | 2 | ||||
| -rw-r--r-- | fastboot/Android.mk | 2 |
5 files changed, 4 insertions, 6 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index 265c8f6..c458ecb 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -40,13 +40,11 @@ ifeq ($(HOST_OS),windows) ifneq ($(strip $(USE_CYGWIN)),) # Pure cygwin case LOCAL_LDLIBS += -lpthread -lgdi32 - LOCAL_C_INCLUDES += /usr/include/w32api/ddk endif ifneq ($(strip $(USE_MINGW)),) # MinGW under Linux case LOCAL_LDLIBS += -lws2_32 -lgdi32 USE_SYSDEPS_WIN32 := 1 - LOCAL_C_INCLUDES += /usr/i586-mingw32msvc/include/ddk endif LOCAL_C_INCLUDES += development/host/windows/usb/api/ endif @@ -75,7 +73,7 @@ else LOCAL_SRC_FILES += fdevent.c endif -LOCAL_CFLAGS += -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter -Werror +LOCAL_CFLAGS += -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter -Wno-error=cpp -Werror LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE LOCAL_MODULE := adb LOCAL_MODULE_TAGS := debug diff --git a/adb/commandline.c b/adb/commandline.c index 51c039e..05b4ef6 100644 --- a/adb/commandline.c +++ b/adb/commandline.c @@ -15,6 +15,7 @@ */ #include <stdio.h> +#include <stdint.h> #include <stdlib.h> #include <string.h> #include <errno.h> diff --git a/adb/sysdeps.h b/adb/sysdeps.h index ba4306f..ac9415c 100644 --- a/adb/sysdeps.h +++ b/adb/sysdeps.h @@ -35,6 +35,7 @@ #include <sys/stat.h> #include <errno.h> #include <ctype.h> +#include <direct.h> #define OS_PATH_SEPARATOR '\\' #define OS_PATH_SEPARATOR_STR "\\" diff --git a/adb/sysdeps_win32.c b/adb/sysdeps_win32.c index 29f58ec..1904325 100644 --- a/adb/sysdeps_win32.c +++ b/adb/sysdeps_win32.c @@ -1549,7 +1549,7 @@ _wait_for_all(HANDLE* handles, int handles_count) * reset" event that will remain set once it was set. */ main_event = CreateEvent(NULL, TRUE, FALSE, NULL); if (main_event == NULL) { - D("Unable to create main event. Error: %d", GetLastError()); + D("Unable to create main event. Error: %d", (int)GetLastError()); free(threads); return (int)WAIT_FAILED; } diff --git a/fastboot/Android.mk b/fastboot/Android.mk index d212b2c..f03bbea 100644 --- a/fastboot/Android.mk +++ b/fastboot/Android.mk @@ -41,13 +41,11 @@ ifeq ($(HOST_OS),windows) ifneq ($(strip $(USE_CYGWIN)),) # Pure cygwin case LOCAL_LDLIBS += -lpthread - LOCAL_C_INCLUDES += /usr/include/w32api/ddk endif ifneq ($(strip $(USE_MINGW)),) # MinGW under Linux case LOCAL_LDLIBS += -lws2_32 USE_SYSDEPS_WIN32 := 1 - LOCAL_C_INCLUDES += /usr/i586-mingw32msvc/include/ddk endif LOCAL_C_INCLUDES += development/host/windows/usb/api endif |