From e6b98d315254788e8fabceba840da3f6dfd6fbd5 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Mon, 19 Dec 2005 00:15:04 +0000 Subject: Undo previous change. This header file belongs to the public interface and the change could break the compilation of thrid party apps which link against this library. --- include/curl/multi.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/curl/multi.h b/include/curl/multi.h index 35cf34885..96c2763ef 100644 --- a/include/curl/multi.h +++ b/include/curl/multi.h @@ -45,7 +45,11 @@ #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 +#endif #else /* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish -- cgit v1.2.3