External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "build: Solve mingw build clash with DATADIR"

Browse Source 
This reverts commit 8a8e86564a.

The patch was premature, as it still fails to build on mingw at least
in the environment used by
https://travis-ci.org/libvirt/libvirt/jobs/569132417

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2019-08-07 21:11:15 -05:00
parent 8a8e86564a
commit 086764748e
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf/checkpoint_conf.c
View File

@ -21,6 +21,8 @@
#include <config.h>
#include <unistd.h>
#include "configmake.h"
#include "internal.h"
#include "virbitmap.h"

3
src/util/viratomic.h
View File

@ -218,10 +218,7 @@ VIR_STATIC unsigned int virAtomicIntXor(volatile unsigned int *atomic,
# ifdef VIR_ATOMIC_OPS_WIN32
# pragma push_macro("DATADIR") /* If "configmake.h" was included first */
# undef DATADIR
# include <winsock2.h>
# pragma pop_macro("DATADIR")
# include <windows.h>
# include <intrin.h>
# if !defined(_M_AMD64) && !defined (_M_IA64) && !defined(_M_X64)