From: Eric Blake <eblake@redhat.com>
Date: Thu, 8 Aug 2019 13:49:43 +0000 (-0500)
Subject: maint: Improve use of configmake.h on mingw
X-Git-Tag: v5.7.0-rc1~171
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1eff313b10cc52d93592ef84ccb0896467f4e85d;p=thirdparty%2Flibvirt.git

maint: Improve use of configmake.h on mingw

Gnulib has added a patch that allows configmake.h to be included
without causing build failures on mingw if <winsock2.h> is later
included (whether directly, or indirectly such as through gnulib's
<unistd.h>).

This reverts commit fed58d83c60ff1c20292856bec006577788b7494 ("build:
Fix checkpoint_conf on mingw"), now that we don't have to worry about
header inclusion ordering issues.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/.gnulib b/.gnulib
index c8e2eee548..1f6fb368c0 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit c8e2eee548e6e81f3fccd31cf9f9a825db7fc8a8
+Subproject commit 1f6fb368c04919243e2c70f2aa514a5f88e95309
diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c
index b744e2b363..a3513aaa65 100644
--- a/src/conf/checkpoint_conf.c
+++ b/src/conf/checkpoint_conf.c
@@ -21,8 +21,6 @@
 
 #include <config.h>
 
-#include <unistd.h>
-
 #include "configmake.h"
 #include "internal.h"
 #include "virbitmap.h"