From: Eric Blake <eblake@redhat.com>
Date: Thu, 8 Aug 2019 02:11:15 +0000 (-0500)
Subject: Revert "build: Solve mingw build clash with DATADIR"
X-Git-Tag: v5.7.0-rc1~337
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=086764748e1a6b9aaf968db68145e05837eae3bd;p=thirdparty%2Flibvirt.git

Revert "build: Solve mingw build clash with DATADIR"

This reverts commit 8a8e86564ac22792d9abcd33c16c25493ca4ab2e.

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

diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c
index 5f4c275dd8..5ce4cc4853 100644
--- a/src/conf/checkpoint_conf.c
+++ b/src/conf/checkpoint_conf.c
@@ -21,6 +21,8 @@
 
 #include <config.h>
 
+#include <unistd.h>
+
 #include "configmake.h"
 #include "internal.h"
 #include "virbitmap.h"
diff --git a/src/util/viratomic.h b/src/util/viratomic.h
index c6e7668324..35800dafcd 100644
--- a/src/util/viratomic.h
+++ b/src/util/viratomic.h
@@ -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)