Commit 5df4be11 authored by Yang Tse's avatar Yang Tse
Browse files

Check for USE_WINSOCK instead of WIN32 where the check was done 

to verify winsock API availability.
parent 96445f1b

ares/adig.c

+2 −2
Original line number Diff line number Diff line
@@ -153,8 +153,8 @@ int main(int argc, char **argv) 
  fd_set read_fds, write_fds;

  struct timeval *tvp, tv;



#ifdef WIN32

  WORD wVersionRequested = MAKEWORD(1,1);

#ifdef USE_WINSOCK

  WORD wVersionRequested = MAKEWORD(USE_WINSOCK,USE_WINSOCK);

  WSADATA wsaData;

  WSAStartup(wVersionRequested, &wsaData);

#endif

ares/ahost.c

+2 −2
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ int main(int argc, char **argv) 
  struct in_addr addr4;

  struct in6_addr addr6;



#ifdef WIN32

  WORD wVersionRequested = MAKEWORD(1,1);

#ifdef USE_WINSOCK

  WORD wVersionRequested = MAKEWORD(USE_WINSOCK,USE_WINSOCK);

  WSADATA wsaData;

  WSAStartup(wVersionRequested, &wsaData);

#endif

ares/ares_process.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
#define TRUE 1

#endif



#if (defined(WIN32) || defined(WATT32)) && !defined(MSDOS)

#ifdef USE_WINSOCK

#define GET_ERRNO()  WSAGetLastError()

#else

#define GET_ERRNO()  errno

ares/setup.h

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ 
 * Typedef our socket type

 */



#if defined(WIN32) && !defined(WATT32)

#ifdef USE_WINSOCK

typedef SOCKET ares_socket_t;

#define ARES_SOCKET_BAD INVALID_SOCKET

#else

lib/connect.c

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ 
#define FALSE 0

#endif



#ifdef WIN32

#ifdef USE_WINSOCK

#define EINPROGRESS WSAEINPROGRESS

#define EWOULDBLOCK WSAEWOULDBLOCK

#define EISCONN     WSAEISCONN
@@ -121,7 +121,7 @@ singleipconnect(struct connectdata *conn, 
 */

int Curl_sockerrno(void)

{

#ifdef WIN32

#ifdef USE_WINSOCK

  return (int)WSAGetLastError();

#else

  return errno;