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

Cleanup windows header includes. Where aplicable, inclusion of 

windows.h winsock.h winsock2.h ws2tcpip.h is done in setup.h
parent 8a3280a2

ares/ares.h

+1 −4
Original line number Diff line number Diff line
@@ -31,10 +31,7 @@ 
  #include <netinet/in.h>

  #include <sys/socket.h>

  #include <tcp.h>

#elif defined(WIN32)

  #include <winsock2.h>

  #include <windows.h>

#else

#elif !defined(WIN32)

  #include <netinet/in.h>

  #include <sys/socket.h>

#endif

ares/nameser.h

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
   port build */



#ifndef NETWARE

#include <windows.h>

#include <process.h> /* for the _getpid() proto */

#endif  /* !NETWARE */

#include <sys/types.h>

include/curl/multi.h

+1 −5
Original line number Diff line number Diff line
@@ -45,11 +45,7 @@ 


#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__) || \

  defined(__MINGW32__)

#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H))

/* The check above prevents the winsock2 inclusion if winsock.h already was

   included, since they can't co-exist without problems */

#include <winsock2.h>

#endif



#else



/* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish

lib/connect.c

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ 
#endif



#ifdef WIN32

#include <windows.h>

#define EINPROGRESS WSAEINPROGRESS

#define EWOULDBLOCK WSAEWOULDBLOCK

#define EISCONN     WSAEISCONN

lib/getenv.c

+0 −5
Original line number Diff line number Diff line
@@ -27,10 +27,6 @@ 
#include <stdlib.h>

#include <string.h>



#ifdef WIN32

#include <windows.h>

#endif



#ifdef VMS

#include <unixlib.h>

#endif
@@ -47,7 +43,6 @@ char *GetEnv(const char *variable) 
  return NULL;

#else

#ifdef WIN32

  /* This shit requires windows.h (HUGE) to be included */

  char env[MAX_PATH]; /* MAX_PATH is from windef.h */

  char *temp = getenv(variable);

  env[0] = '\0';