Re: [libvirt] [PATCH libvirt 2/6] include winsock2.h before windows.h

On 01/25/2012 01:13 PM, Marc-André Lureau wrote: NACK. I agree that things should be fixed, but the fix should live in the problematic "threads.h" inclusion pattern, not in the downstream virkeepalive.c. Does this alternate patch work for you? (One of these days, I need to install the mingw64 cross-compiler, so I can test it myself.) diff --git i/src/util/threads-win32.h w/src/util/threads-win32.h index 8109afd..1b23402 100644 --- i/src/util/threads-win32.h +++ w/src/util/threads-win32.h @@ -1,7 +1,7 @@ /* * threads-win32.h basic thread synchronization primitives * - * Copyright (C) 2009, 2011 Red Hat, Inc. + * Copyright (C) 2009, 2011-2012 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,6 +21,9 @@ #include "internal.h" +#ifdef HAVE_WINSOCK2_H +# include <winsock2.h> +#endif #include <windows.h> struct virMutex { -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org