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 c8e2eee548e6e81f3fccd31cf9f9a825db7fc8a8..1f6fb368c04919243e2c70f2aa514a5f88e95309 160000 (submodule)
--- 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 b744e2b36331b99a5f9198891b82b3bab7f83d34..a3513aaa657ad0f1786cec613229c49d2e684626 100644 (file)
--- 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"