Introduce symbol USE_WINSOCK which will be defined when

using winsock or winsock2 API.

diff --git a/ares/setup.h b/ares/setup.h
index 70af3be3c39de665d20a4630ffb96ea0ac5d4305..3b97e273eba5e1fc99e8e88ed19838c131f9a333 100644 (file)
--- a/ares/setup.h
+++ b/ares/setup.h
@@ -69,6 +69,22 @@
 #  endif
 #endif
 
+/*
+ * Define USE_WINSOCK to 2 if we have and use WINSOCK2 API, else
+ * define USE_WINSOCK to 1 if we have and use WINSOCK  API, else
+ * undefine USE_WINSOCK.
+ */
+
+#undef USE_WINSOCK
+
+#ifdef HAVE_WINSOCK2_H
+#  define USE_WINSOCK 2
+#else
+#  ifdef HAVE_WINSOCK_H
+#    define USE_WINSOCK 1
+#  endif
+#endif
+
 /*
  * Work-arounds for systems without configure support
  */

diff --git a/lib/setup.h b/lib/setup.h
index a02834ecdc8470c5839306e7050db06401b1a5cd..6bcde3d5c08548842822da2fd291e3228049e792 100644 (file)
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -103,6 +103,22 @@
 #  endif
 #endif
 
+/*
+ * Define USE_WINSOCK to 2 if we have and use WINSOCK2 API, else
+ * define USE_WINSOCK to 1 if we have and use WINSOCK  API, else
+ * undefine USE_WINSOCK.
+ */
+
+#undef USE_WINSOCK
+
+#ifdef HAVE_WINSOCK2_H
+#  define USE_WINSOCK 2
+#else
+#  ifdef HAVE_WINSOCK_H
+#    define USE_WINSOCK 1
+#  endif
+#endif
+
 
 #ifndef TRUE
 #define TRUE 1

diff --git a/src/setup.h b/src/setup.h
index 6e0f23a1535c58c33bd8cdecc7cc8a33c631c1ab..139b7467fc806f28650ab12ffae820956aa6c5ec 100644 (file)
--- a/src/setup.h
+++ b/src/setup.h
@@ -105,6 +105,23 @@
 #  endif
 #endif
 
+/*
+ * Define USE_WINSOCK to 2 if we have and use WINSOCK2 API, else
+ * define USE_WINSOCK to 1 if we have and use WINSOCK  API, else
+ * undefine USE_WINSOCK.
+ */
+
+#undef USE_WINSOCK
+
+#ifdef HAVE_WINSOCK2_H
+#  define USE_WINSOCK 2
+#else
+#  ifdef HAVE_WINSOCK_H
+#    define USE_WINSOCK 1
+#  endif
+#endif
+
+
 #include <stdio.h>
 
 #ifdef __TANDEM