]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commit
log_manager: Include configmake.h last
authorMichal Privoznik <mprivozn@redhat.com>
Tue, 1 Dec 2015 15:43:56 +0000 (16:43 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Tue, 1 Dec 2015 15:43:56 +0000 (16:43 +0100)
commitbd205a9036c17c94c925d584e3d8c8a376ae60f8
treecc264f9cc2e778cae1a936782a737934099c9c7c
parent01f6cbcf074c7cc83f255bb3cb655319a75f83aa
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@redhat.com>
src/logging/log_manager.c