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

Commit 6cf1193b authored Oct 02, 2014 by Stephen Hines Committed by Android Git Automerger Oct 02, 2014

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

* commit '2f431a8d':
  Fix windows-specific error without messing up Makefile flags.

parents 490f03d5 2f431a8d

adb/Android.mk

+0 −3

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

adb/sysdeps.h

+1 −1

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

adb/sysdeps_win32.c

+1 −1

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

adb/usb_windows.c

+1 −0

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