mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 13:45:38 +00:00
build: Fix checkpoint_conf on mingw
CI flagged a failing mingw build, due to: In file included from ../../src/conf/checkpoint_conf.c:24: ../gnulib/lib/configmake.h:8:17: error: expected identifier or '(' before string constant 8 | #define DATADIR "/usr/i686-w64-mingw32/sys-root/mingw/share" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ As previously learned in commitsbd205a90
and976abdf6
, gnulib's configmake.h header does #define DATADIR "string...", while mingw's <winsock2.h> expects to declare a type named DATADIR. As long as the mingw system header is included first before configmake.h, the two uses do not conflict, but until gnulib is patched to make configmake.h automatically work around the issue, our immediate fix is the workaround of rearranging our include order to insure no conflict. Copy the paradigm used in domain_conf.c of using <unistd.h> to trigger the indirect inclusion of <winsock2.h> on mingw. Fixes:1a4df34a
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
parent
a1be4aaa96
commit
fed58d83c6
@ -21,6 +21,8 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include <unistd.h>
|
||||
|
||||
#include "configmake.h"
|
||||
#include "internal.h"
|
||||
#include "virbitmap.h"
|
||||
|
Loading…
Reference in New Issue
Block a user