am 940632f1: Merge "Remove references to __CYGWIN__ and HAVE_WINSOCK2_H." (ae25aed3) · Commits · e / os / android_build

core/combo/include/arch/windows/AndroidConfig.h

+5 −15

Original line number	Original line	Diff line number	Diff line
	@@ -58,19 +58,19 @@
	/* TODO: replace references to this. */		/* TODO: replace references to this. */
	#define HAVE_WIN32_IPC		#define HAVE_WIN32_IPC

			#ifdef __CYGWIN__
			#error "CYGWIN is unsupported for platform builds"
			#endif

	/*		/*
	* Define this if you build against MSVCRT.DLL		* Define this if you build against MSVCRT.DLL
	*/		*/
	#ifndef __CYGWIN__
	#define HAVE_MS_C_RUNTIME		#define HAVE_MS_C_RUNTIME
	#endif

	/*		/*
	* Define this if we want to use WinSock.		* Define this if we want to use WinSock.
	*/		*/
	#ifndef __CYGWIN__
	#define HAVE_WINSOCK		#define HAVE_WINSOCK
	#endif

	/*		/*
	* We need to choose between 32-bit and 64-bit off_t. All of our code should		* We need to choose between 32-bit and 64-bit off_t. All of our code should
	@@ -94,16 +94,6 @@
	*/		*/
	#define OS_PATH_SEPARATOR '\\'		#define OS_PATH_SEPARATOR '\\'

	/*
	* Define if <winsock2.h> exists.
	* Only MinGW has it.
	*/
	#ifdef USE_MINGW
	#define HAVE_WINSOCK2_H 1
	#else
	/* #define HAVE_WINSOCK2_H */
	#endif

	/*		/*
	* Various definitions missing in MinGW		* Various definitions missing in MinGW
	*/		*/