diff options
| author | Stephen Hines <srhines@google.com> | 2014-10-02 13:38:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 13:38:33 +0000 |
| commit | 0d8b1bdcce553a60fb9112ca403c00ad9d8842a5 (patch) | |
| tree | 5e3e9467fe4bf8a3aef09d90c6f3b18be36a4a7e /adb | |
| parent | 4c4fa1a57fcf7aaf174655532b19b813a7f43ad3 (diff) | |
| parent | a866e5a8eb0d331c5970ee106cf8f5bd0903eb7c (diff) | |
| download | system_core-0d8b1bdcce553a60fb9112ca403c00ad9d8842a5.zip system_core-0d8b1bdcce553a60fb9112ca403c00ad9d8842a5.tar.gz system_core-0d8b1bdcce553a60fb9112ca403c00ad9d8842a5.tar.bz2 | |
am a866e5a8: am 6cf1193b: am 2f431a8d: Fix windows-specific error without messing up Makefile flags.
* commit 'a866e5a8eb0d331c5970ee106cf8f5bd0903eb7c':
Fix windows-specific error without messing up Makefile flags.
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/Android.mk | 3 | ||||
| -rw-r--r-- | adb/sysdeps.h | 2 | ||||
| -rw-r--r-- | adb/sysdeps_win32.c | 2 | ||||
| -rw-r--r-- | adb/usb_windows.c | 1 |
4 files changed, 3 insertions, 5 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index 446ff4d..3828ed3 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -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 diff --git a/adb/sysdeps.h b/adb/sysdeps.h index ac9415c..cc1f839 100644 --- a/adb/sysdeps.h +++ b/adb/sysdeps.h @@ -26,8 +26,8 @@ #ifdef _WIN32 -#include <windows.h> #include <winsock2.h> +#include <windows.h> #include <ws2tcpip.h> #include <process.h> #include <fcntl.h> diff --git a/adb/sysdeps_win32.c b/adb/sysdeps_win32.c index 1904325..b082c6d 100644 --- a/adb/sysdeps_win32.c +++ b/adb/sysdeps_win32.c @@ -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 diff --git a/adb/usb_windows.c b/adb/usb_windows.c index 1309a78..b7ad913 100644 --- a/adb/usb_windows.c +++ b/adb/usb_windows.c @@ -14,6 +14,7 @@ * limitations under the License. */ +#include <winsock2.h> #include <windows.h> #include <winerror.h> #include <errno.h> |