move WinSock definitions of EBADF, EINTR, EINVAL and EAFNOSUPPORT to setup_once.h

diff --git a/ares/setup_once.h b/ares/setup_once.h
index 6911f1bcfcb09c1aaedcbf61f5016712eecd9c7b..083fdbc4f092a2ae26dfaa93ed675b68462cbabe 100644 (file)
--- a/ares/setup_once.h
+++ b/ares/setup_once.h
@@ -276,6 +276,12 @@ typedef int sig_atomic_t;
  */
 
 #ifdef USE_WINSOCK
+#undef  EBADF            /* override definition in errno.h */
+#define EBADF            WSAEBADF
+#undef  EINTR            /* override definition in errno.h */
+#define EINTR            WSAEINTR
+#undef  EINVAL           /* override definition in errno.h */
+#define EINVAL           WSAEINVAL
 #define EWOULDBLOCK      WSAEWOULDBLOCK
 #define EINPROGRESS      WSAEINPROGRESS
 #define EALREADY         WSAEALREADY

diff --git a/lib/inet_pton.c b/lib/inet_pton.c
index 192d0624acb0594216b6aa4dc25ead2e36275d3e..fb7feef284e8f9ba461bca700c43341bad3fc509 100644 (file)
--- a/lib/inet_pton.c
+++ b/lib/inet_pton.c
@@ -41,10 +41,6 @@
 #define INADDRSZ         4
 #define INT16SZ          2
 
-#ifdef USE_WINSOCK
-#define EAFNOSUPPORT    WSAEAFNOSUPPORT
-#endif
-
 /*
  * WARNING: Don't even consider trying to compile this on a system where
  * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.

diff --git a/lib/select.c b/lib/select.c
index ddc40593ee585f2552afe254bfe4b37324f35f37..2af14eb362212350c4d8739f3c03f4c7a73fd346 100644 (file)
--- a/lib/select.c
+++ b/lib/select.c
@@ -23,8 +23,6 @@
 
 #include "setup.h"
 
-#include <errno.h>
-
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
@@ -51,15 +49,6 @@
 #include "connect.h"
 #include "select.h"
 
-#ifdef USE_WINSOCK
-#  undef  EBADF
-#  define EBADF  WSAEBADF
-#  undef  EINTR
-#  define EINTR  WSAEINTR
-#  undef  EINVAL
-#  define EINVAL WSAEINVAL
-#endif
-
 /* Winsock and TPF sockets are not in range [0..FD_SETSIZE-1] */
 
 #if defined(USE_WINSOCK) || defined(TPF)

diff --git a/lib/setup_once.h b/lib/setup_once.h
index 79324d40f64d889c332ed8d5d8cb2d2f04241b1a..03141a4ff97e74e06b4d5abc7d0d6d43610b7d97 100644 (file)
--- a/lib/setup_once.h
+++ b/lib/setup_once.h
@@ -283,6 +283,12 @@ typedef int sig_atomic_t;
  */
 
 #ifdef USE_WINSOCK
+#undef  EBADF            /* override definition in errno.h */
+#define EBADF            WSAEBADF
+#undef  EINTR            /* override definition in errno.h */
+#define EINTR            WSAEINTR
+#undef  EINVAL           /* override definition in errno.h */
+#define EINVAL           WSAEINVAL
 #define EWOULDBLOCK      WSAEWOULDBLOCK
 #define EINPROGRESS      WSAEINPROGRESS
 #define EALREADY         WSAEALREADY