[libvirt] [PATCH] log_manager: Include configmake.h last
The problem is that in some mingw header DATADIR is used but
gnulib defines it too. This leads to the following compile error:
CC locking/libvirt_driver_la-lock_manager.lo
In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/objbase.h:66:0,
from /usr/i686-w64-mingw32/sys-root/mingw/include/ole2.h:17,
from /usr/i686-w64-mingw32/sys-root/mingw/include/wtypes.h:12,
from /usr/i686-w64-mingw32/sys-root/mingw/include/winscard.h:10,
from /usr/i686-w64-mingw32/sys-root/mingw/include/windows.h:97,
from /usr/i686-w64-mingw32/sys-root/mingw/include/winsock2.h:23,
from ../gnulib/lib/unistd.h:48,
from ../../src/util/virutil.h:29,
from ../../src/logging/log_manager.c:30:
/usr/i686-w64-mingw32/sys-root/mingw/include/objidl.h:12275:2: error: expected identifier
or '(' before string constant
} DATADIR;
^
Makefile:7888: recipe for target 'logging/libvirt_driver_la-log_manager.lo'
failed
The fix is to include configmake.h at the end of includes.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/logging/log_manager.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c
index 5ff5f12..7a4c7e2 100644
--- a/src/logging/log_manager.c
+++ b/src/logging/log_manager.c
@@ -22,8 +22,6 @@
#include <config.h>
-#include "configmake.h"
-
#include "log_manager.h"
#include "log_protocol.h"
#include "viralloc.h"
@@ -33,6 +31,7 @@
#include "virfile.h"
#include "rpc/virnetclient.h"
+#include "configmake.h"
#define VIR_FROM_THIS VIR_FROM_LOGGING
--
2.4.10