On 23.06.2015 13:30, Martin Kletzander wrote:

By trying to lead the way of clean includes, I sorted the lines alphabetically and that is a problem for mingw builds with gnulib. As 'configmake.h' defines DATADIR and 'datatypes.h' transitively includes 'winsock.h' that uses 'DATADIR' as a name for a struct, it's enough to reorder those.

Even though this might be worked around in gnulib later on, this fixes the build for now.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/libvirt-admin.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index 11b6fe3238b8..b3fd0b3a8cf2 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -25,8 +25,9 @@ #include <rpc/rpc.h>

#include "internal.h" -#include "configmake.h" #include "datatypes.h" +#include "configmake.h" + #include "viralloc.h" #include "virlog.h" #include "virnetclient.h"

ACK Michal