Avoid redundant check. configure script takes care of not defining

HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H, neither
HAVE_WS2TCPIP_H when __CYGWIN__ is defined.

diff --git a/ares/setup.h b/ares/setup.h
index f3ced3ed8362c7809192407a8d3c2d5b8ee1669a..70af3be3c39de665d20a4630ffb96ea0ac5d4305 100644 (file)
--- a/ares/setup.h
+++ b/ares/setup.h
@@ -47,10 +47,12 @@
  * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
  * to any other further and independant block.  Under Cygwin things work
  * just as under linux (e.g. <sys/socket.h>) and the winsock headers should
- * never be included when __CYGWIN__ is defined.
+ * never be included when __CYGWIN__ is defined.  configure script takes
+ * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H,
+ * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
  */
 
-#if defined(HAVE_WINDOWS_H) && !defined(__CYGWIN__)
+#ifdef HAVE_WINDOWS_H
 #  ifndef WIN32_LEAN_AND_MEAN
 #    define WIN32_LEAN_AND_MEAN
 #  endif

diff --git a/lib/setup.h b/lib/setup.h
index 12f00540be5f60ba03922aac4cb4cef6c43dd855..3538256c4b6780ba83eceee3e1e807eaae7920a7 100644 (file)
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -81,10 +81,12 @@
  * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
  * to any other further and independant block.  Under Cygwin things work
  * just as under linux (e.g. <sys/socket.h>) and the winsock headers should
- * never be included when __CYGWIN__ is defined.
+ * never be included when __CYGWIN__ is defined.  configure script takes
+ * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H,
+ * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
  */
 
-#if defined(HAVE_WINDOWS_H) && !defined(__CYGWIN__)
+#ifdef HAVE_WINDOWS_H
 #  ifndef WIN32_LEAN_AND_MEAN
 #    define WIN32_LEAN_AND_MEAN
 #  endif

diff --git a/src/setup.h b/src/setup.h
index 78cb115933842593716ba634ebd40add18c05184..1acd19e85624650712ed3d6c49deab00f09f57cd 100644 (file)
--- a/src/setup.h
+++ b/src/setup.h
@@ -83,10 +83,12 @@
  * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs 
  * to any other further and independant block.  Under Cygwin things work
  * just as under linux (e.g. <sys/socket.h>) and the winsock headers should
- * never be included when __CYGWIN__ is defined.
+ * never be included when __CYGWIN__ is defined.  configure script takes
+ * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H,
+ * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
  */
 
-#if defined(HAVE_WINDOWS_H) && !defined(__CYGWIN__)
+#ifdef HAVE_WINDOWS_H
 #  ifndef WIN32_LEAN_AND_MEAN
 #    define WIN32_LEAN_AND_MEAN
 #  endif