Merge "Remove references to __CYGWIN__ and HAVE_WINSOCK2_H."
diff --git a/core/combo/include/arch/windows/AndroidConfig.h b/core/combo/include/arch/windows/AndroidConfig.h
index 346ba89..e7eb837 100644
--- a/core/combo/include/arch/windows/AndroidConfig.h
+++ b/core/combo/include/arch/windows/AndroidConfig.h
@@ -58,19 +58,19 @@
/* TODO: replace references to this. */
#define HAVE_WIN32_IPC
+#ifdef __CYGWIN__
+#error "CYGWIN is unsupported for platform builds"
+#endif
+
/*
* Define this if you build against MSVCRT.DLL
*/
-#ifndef __CYGWIN__
-# define HAVE_MS_C_RUNTIME
-#endif
+#define HAVE_MS_C_RUNTIME
/*
* Define this if we want to use WinSock.
*/
-#ifndef __CYGWIN__
#define HAVE_WINSOCK
-#endif
/*
* We need to choose between 32-bit and 64-bit off_t. All of our code should
@@ -95,16 +95,6 @@
#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
*/
#ifdef USE_MINGW