Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f431a8d authored by Stephen Hines's avatar Stephen Hines
Browse files

Fix windows-specific error without messing up Makefile flags. 

Bug: 14416410

The proper fix for the error/warning we encountered is to move winsock2.h
in front of windows.h.

Change-Id: I29504ba3a184a85c6636d06c2ad900828fdb5436
parent 3ea87c33

adb/Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -73,9 +73,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

adb/sysdeps.h

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line 
#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

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 * limitations under the License.

 */



#include <winsock2.h>

#include <windows.h>

#include <winerror.h>

#include <errno.h>