On 29.12.2014 20:44, Steve Holme wrote:

> On Mon, 29 Dec 2014, Sergei Nikulov wrote:
>
>> Could you please review and integrate?
> I took a brief look at the patch but unfortunately, like the other administrators here, I'm not an expert in cmake :(
>
> If any of the other cmake users, are able to take a look and give the patch a thumbs up then I can push.
>
/(I use CMake in a different project, I do not use CMake with libcurl.)/

The CMake changes I see in the pull request
<https://github.com/bagder/curl/pull/131> are all reasonable. Assuming
it passes a simple build test, I think they are OK, I see nothing
controversial or world changing.

TBH, I would go as far as completely ignoring |windows.h| in the entire
curl/libcurl and replace all of its uses with |winsock2.h|. They are
effectively equivalent because one of the first things |winsock2.h| does
is it includes |windows.h|. This solves this issue as well. Then the
only place where you have to guard against old |winsock.h| inclusion is
in any public headers, if there are any such headers doing that.

—VZ

​

-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette: http://curl.haxx.se/mail/etiquette.html