diff options
| author | Yang Tse <yangsita@gmail.com> | 2007-04-04 06:06:36 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2007-04-04 06:06:36 +0000 |
| commit | 8fe9376d542ef4f11b2049190de363f7b79436ec (patch) | |
| tree | 9ad6908d6ed331e2cfad12eb65cd08b9f4e2b294 | |
| parent | a1f72943e96172b4598bf3cb5993c554d1294b8c (diff) | |
move WinSock definitions of EBADF, EINTR, EINVAL and EAFNOSUPPORT to setup_once.h
| -rw-r--r-- | ares/setup_once.h | 6 | ||||
| -rw-r--r-- | lib/inet_pton.c | 4 | ||||
| -rw-r--r-- | lib/select.c | 11 | ||||
| -rw-r--r-- | lib/setup_once.h | 6 |
4 files changed, 12 insertions, 15 deletions
diff --git a/ares/setup_once.h b/ares/setup_once.h index 6911f1bcf..083fdbc4f 100644 --- 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 192d0624a..fb7feef28 100644 --- 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 ddc40593e..2af14eb36 100644 --- 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 79324d40f..03141a4ff 100644 --- 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 |