Commit d9bf5557 authored by Yang Tse's avatar Yang Tse
Browse files

Move portable error number symbolic name definitions to setup_once.h

parent b54a8531

ares/nameser.h

+0 −5
Original line number Diff line number Diff line
@@ -18,11 +18,6 @@ 


#define MAXHOSTNAMELEN 256



#define EINPROGRESS WSAEINPROGRESS

#define EWOULDBLOCK WSAEWOULDBLOCK

#define EMSGSIZE     WSAEMSGSIZE

#define EAFNOSUPPORT WSAEAFNOSUPPORT



/* Structure for scatter/gather I/O.  */

struct iovec

{

ares/setup_once.h

+45 −0
Original line number Diff line number Diff line
@@ -186,5 +186,50 @@ typedef int sig_atomic_t; 
#endif





/*

 * Portable error number symbolic names defined to Winsock error codes.

 */



#ifdef USE_WINSOCK

#define EWOULDBLOCK      WSAEWOULDBLOCK

#define EINPROGRESS      WSAEINPROGRESS

#define EALREADY         WSAEALREADY

#define ENOTSOCK         WSAENOTSOCK

#define EDESTADDRREQ     WSAEDESTADDRREQ

#define EMSGSIZE         WSAEMSGSIZE

#define EPROTOTYPE       WSAEPROTOTYPE

#define ENOPROTOOPT      WSAENOPROTOOPT

#define EPROTONOSUPPORT  WSAEPROTONOSUPPORT

#define ESOCKTNOSUPPORT  WSAESOCKTNOSUPPORT

#define EOPNOTSUPP       WSAEOPNOTSUPP

#define EPFNOSUPPORT     WSAEPFNOSUPPORT

#define EAFNOSUPPORT     WSAEAFNOSUPPORT

#define EADDRINUSE       WSAEADDRINUSE

#define EADDRNOTAVAIL    WSAEADDRNOTAVAIL

#define ENETDOWN         WSAENETDOWN

#define ENETUNREACH      WSAENETUNREACH

#define ENETRESET        WSAENETRESET

#define ECONNABORTED     WSAECONNABORTED

#define ECONNRESET       WSAECONNRESET

#define ENOBUFS          WSAENOBUFS

#define EISCONN          WSAEISCONN

#define ENOTCONN         WSAENOTCONN

#define ESHUTDOWN        WSAESHUTDOWN

#define ETOOMANYREFS     WSAETOOMANYREFS

#define ETIMEDOUT        WSAETIMEDOUT

#define ECONNREFUSED     WSAECONNREFUSED

#define ELOOP            WSAELOOP

#define ENAMETOOLONG     WSAENAMETOOLONG

#define EHOSTDOWN        WSAEHOSTDOWN

#define EHOSTUNREACH     WSAEHOSTUNREACH

#define ENOTEMPTY        WSAENOTEMPTY

#define EPROCLIM         WSAEPROCLIM

#define EUSERS           WSAEUSERS

#define EDQUOT           WSAEDQUOT

#define ESTALE           WSAESTALE

#define EREMOTE          WSAEREMOTE

#endif





#endif /* __SETUP_ONCE_H */

lib/connect.c

+0 −8
Original line number Diff line number Diff line
@@ -84,14 +84,6 @@ 
#define FALSE 0

#endif



#ifdef USE_WINSOCK

#define EINPROGRESS WSAEINPROGRESS

#define EWOULDBLOCK WSAEWOULDBLOCK

#define EISCONN     WSAEISCONN

#define ENOTSOCK    WSAENOTSOCK

#define ECONNREFUSED WSAECONNREFUSED

#endif



#include "urldata.h"

#include "sendf.h"

#include "if2ip.h"

lib/inet_ntop.c

+0 −4
Original line number Diff line number Diff line
@@ -55,10 +55,6 @@ 
#define INADDRSZ         4

#define INT16SZ          2



#ifdef USE_WINSOCK

#define EAFNOSUPPORT    WSAEAFNOSUPPORT

#endif



/*

 * Format an IPv4 address, more or less like inet_ntoa().

 *

lib/setup_once.h

+45 −0
Original line number Diff line number Diff line
@@ -193,5 +193,50 @@ typedef int sig_atomic_t; 
#endif





/*

 * Portable error number symbolic names defined to Winsock error codes.

 */



#ifdef USE_WINSOCK

#define EWOULDBLOCK      WSAEWOULDBLOCK

#define EINPROGRESS      WSAEINPROGRESS

#define EALREADY         WSAEALREADY

#define ENOTSOCK         WSAENOTSOCK

#define EDESTADDRREQ     WSAEDESTADDRREQ

#define EMSGSIZE         WSAEMSGSIZE

#define EPROTOTYPE       WSAEPROTOTYPE

#define ENOPROTOOPT      WSAENOPROTOOPT

#define EPROTONOSUPPORT  WSAEPROTONOSUPPORT

#define ESOCKTNOSUPPORT  WSAESOCKTNOSUPPORT

#define EOPNOTSUPP       WSAEOPNOTSUPP

#define EPFNOSUPPORT     WSAEPFNOSUPPORT

#define EAFNOSUPPORT     WSAEAFNOSUPPORT

#define EADDRINUSE       WSAEADDRINUSE

#define EADDRNOTAVAIL    WSAEADDRNOTAVAIL

#define ENETDOWN         WSAENETDOWN

#define ENETUNREACH      WSAENETUNREACH

#define ENETRESET        WSAENETRESET

#define ECONNABORTED     WSAECONNABORTED

#define ECONNRESET       WSAECONNRESET

#define ENOBUFS          WSAENOBUFS

#define EISCONN          WSAEISCONN

#define ENOTCONN         WSAENOTCONN

#define ESHUTDOWN        WSAESHUTDOWN

#define ETOOMANYREFS     WSAETOOMANYREFS

#define ETIMEDOUT        WSAETIMEDOUT

#define ECONNREFUSED     WSAECONNREFUSED

#define ELOOP            WSAELOOP

#define ENAMETOOLONG     WSAENAMETOOLONG

#define EHOSTDOWN        WSAEHOSTDOWN

#define EHOSTUNREACH     WSAEHOSTUNREACH

#define ENOTEMPTY        WSAENOTEMPTY

#define EPROCLIM         WSAEPROCLIM

#define EUSERS           WSAEUSERS

#define EDQUOT           WSAEDQUOT

#define ESTALE           WSAESTALE

#define EREMOTE          WSAEREMOTE

#endif





#endif /* __SETUP_ONCE_H */