commit a866e5a8eb0d331c5970ee106cf8f5bd0903eb7c
author Stephen Hines <srhines@google.com> Thu Oct 02 00:59:36 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 02 00:59:36 2014 +0000
tree 0b74d9e7bcb86c2a6914dd18e3ef51f0e1e3225c
parent 541a780454ca5299a96a5d9bae1fcb650a0c0659
parent 6cf1193bcff2c2f1a43abeeac1ad2b33e422182e

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

* commit '6cf1193bcff2c2f1a43abeeac1ad2b33e422182e':
  Fix windows-specific error without messing up Makefile flags.

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index 138e747..af7d7e5 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -73,9 +73,6 @@
 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

adb/sysdeps.h

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>

adb/sysdeps_win32.c

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

adb/usb_windows.c

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>