From nobody Fri Mar 29 00:02:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565273843; cv=none; d=zoho.com; s=zohoarc; b=Wo2a9cDhLR10BSUcpea1eUxEPCsJ9ymbkQdb4Er1gNJB1mJTj7jewtIxWBiPr3C4zJZcpgqLlt8cx/StaXfaRi8UszKq0u5kFnpKqtrC+QXAZMsL/HulAi7wZgVwKqgxKzamnTIhekDNdyNKC2kwKP9oPZQ8DKPskzgDseBplLY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565273843; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=y1PdGHTVe0lA7Iu7GJFhqq6HsQ+W5mj2jH3y8nRdBYE=; b=fcZqBcOO0+2B988dxzpxZYuQWTZGrSBrv2l+oS4dALFL/qGnR1WETej6SgqKp02biFD6oJGVI5Jo9ub8nZVg88XKx2NJnjRXM28TNT2F549fZo7tfTLl3s2xjY0aHpUI340b5wRJIWqNDyY3i+9bCO5/WeUpodEtQiqCs2pEA6w= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1565273843037893.6684737721199; Thu, 8 Aug 2019 07:17:23 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AD69A121A64; Thu, 8 Aug 2019 14:17:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 850C75D721; Thu, 8 Aug 2019 14:17:21 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3BB9118005A4; Thu, 8 Aug 2019 14:17:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x78EHJNb016507 for ; Thu, 8 Aug 2019 10:17:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id EEFE210016F3; Thu, 8 Aug 2019 14:17:19 +0000 (UTC) Received: from blue.redhat.com (ovpn-116-93.phx2.redhat.com [10.3.116.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id AEE9510016E9; Thu, 8 Aug 2019 14:17:19 +0000 (UTC) From: Eric Blake To: libvir-list@redhat.com Date: Thu, 8 Aug 2019 09:17:19 -0500 Message-Id: <20190808141719.8420-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: mprivozn@redhat.com Subject: [libvirt] [PATCH v2] maint: Improve use of configmake.h on mingw X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 08 Aug 2019 14:17:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Gnulib has added a patch that allows configmake.h to be included without causing build failures on mingw if is later included (whether directly, or indirectly such as through gnulib's ). 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 Reviewed-by: J=C3=A1n Tomko --- v1 was 'build: Solve mingw build clash with DATADIR', and dead on arrival, so it was reverted shortly after. It turns out that pragma push_macro isn't good enough (you have to do it before EVERY site that includes winsock2.h, including those that do so indirectly by including gnulib's replacement unistd.h), so it's better to just fix gnulib from the get-go instead of trying to work around it at every internal spot. This time, I've actually tested mingw locally rather than lazily relying on jenkins to do the mingw validation work for me; I used: make -f Makefile.ci ci-build@fedora-rawhide CI_CONFIGURE=3D"mingw32-configu= re" But since I botched up v1, I'll still wait for a review before pushing v2. Gnulib changes: b5e7a0d configmake: Avoid namespace pollution issue on mingw. .gnulib | 2 +- src/conf/checkpoint_conf.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.gnulib b/.gnulib index c8e2eee548..b5e7a0deb7 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit c8e2eee548e6e81f3fccd31cf9f9a825db7fc8a8 +Subproject commit b5e7a0deb7f9a3fc7f0206e39f6b032b1051d0cd diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 5ce4cc4853..5f4c275dd8 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -21,8 +21,6 @@ #include -#include - #include "configmake.h" #include "internal.h" #include "virbitmap.h" --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list