moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 15:48:49 -05:00
Code Issues Releases Wiki Activity

Undo previous change. This header file belongs to the public

Browse Source 
interface and the change could break the compilation of thrid
party apps which link against this library.
This commit is contained in:
Yang Tse 2005-12-19 00:15:04 +00:00
parent 5fd8dd2dce
commit e6b98d3152
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ares/ares.h
View File

@ -31,7 +31,10 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <tcp.h> #include <tcp.h>
#elif !defined(WIN32) #elif defined(WIN32)
#include <winsock2.h>
#include <windows.h>
#else
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif

1
ares/nameser.h
View File

@ -7,6 +7,7 @@
port build */ port build */
#ifndef NETWARE #ifndef NETWARE
#include <windows.h>
#include <process.h> /* for the _getpid() proto */ #include <process.h> /* for the _getpid() proto */
#endif /* !NETWARE */ #endif /* !NETWARE */
#include <sys/types.h> #include <sys/types.h>

6
include/curl/multi.h
View File

@ -45,7 +45,11 @@
#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__) || \ #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__) || \
defined(__MINGW32__) 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 #else
/* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish /* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish