From 2fad00c56eea89301cc3d556092317c9d10e3c13 Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Fri, 20 Feb 2015 17:04:10 +0000
Subject: [PATCH] Remove references to __CYGWIN__ and HAVE_WINSOCK2_H.

We don't support platform builds under CYGWIN and can safely
assume that all windows host builds are for MinGW32.

HAVE_WINSOCK2_H is currently unused. The only references to it
are in code that define it themselves or in application code that
by definition isn't compiled for windows.

Change-Id: I236d6e070df93f713cb716bb8a461c9c1d32a180
---
 .../include/arch/windows/AndroidConfig.h      | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/core/combo/include/arch/windows/AndroidConfig.h b/core/combo/include/arch/windows/AndroidConfig.h
index 346ba8917..e7eb83714 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
@@ -94,16 +94,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
  */