From: Martin Kletzander <mkletzan@redhat.com>
Date: Tue, 23 Jun 2015 11:22:15 +0000 (+0200)
Subject: admin: Fix mingw build by reordering includes
X-Git-Tag: v1.2.17-rc1~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=976abdf6;p=thirdparty%2Flibvirt.git

admin: Fix mingw build by reordering includes

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>
---

diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c
index 11b6fe3238..b3fd0b3a8c 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"