From nobody Sun May 5 19:38:25 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=1564423527; cv=none; d=zoho.com; s=zohoarc; b=dvNwvYYskdtJi3VcxxIvf7ZVVEhwCR7yZxH7Nhn4qGlEI4AtbAuXvNXFSxX7dsepop0SNZv33eUpu3Lgr86uFZffvWr4t6JJ+sKNOqLHFrEM/QEKSlVBJH4nBGmGJ6CXhOVIywWAMNyxiYparhfoIk2vNuvwUVIbG0v06Dc9WFE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564423527; h=Content-Type:Content-Transfer-Encoding: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=zo3UGiQv0HMhqtAPDB1eh1yIHrnLsp1O1C/MrmwN24Y=; b=U7pziOVoExFEPM8XXeFLpjEAsuZYF57nU1uOu6vYBGXum34K2pcv/6AOWe69ULipLG1wAMb2/xTDZ7velMVsKRiG8Cs8gf2tuBW2WK0xC/CGOxSX9VBtVdcyKFU/UOTzqnsnzHu26iILUPH9qRBBV/2emgXCgpMOC4KCb/DH7ow= 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 1564423527421626.8382786059005; Mon, 29 Jul 2019 11:05:27 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B3ACD85550; Mon, 29 Jul 2019 18:05:25 +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 081A55D9C9; Mon, 29 Jul 2019 18:05:25 +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 26D1B1806B00; Mon, 29 Jul 2019 18:05:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x6TI5LFZ005237 for ; Mon, 29 Jul 2019 14:05:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id BB3EF5D9C9; Mon, 29 Jul 2019 18:05:21 +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 81DD35D9C8 for ; Mon, 29 Jul 2019 18:05:19 +0000 (UTC) From: Eric Blake To: libvir-list@redhat.com Date: Mon, 29 Jul 2019 13:05:18 -0500 Message-Id: <20190729180518.5352-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] build: Fix checkpoint_conf 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 29 Jul 2019 18:05:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" CI flagged a failing mingw build, due to: In file included from ../../src/conf/checkpoint_conf.c:24: ../gnulib/lib/configmake.h:8:17: error: expected identifier or '(' before s= tring constant 8 | #define DATADIR "/usr/i686-w64-mingw32/sys-root/mingw/share" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ As previously learned in commits bd205a90 and 976abdf6, gnulib's configmake.h header does #define DATADIR "string...", while mingw's expects to declare a type named DATADIR. As long as the mingw system header is included first before configmake.h, the two uses do not conflict, but until gnulib is patched to make configmake.h automatically work around the issue, our immediate fix is the workaround of rearranging our include order to insure no conflict. Copy the paradigm used in domain_conf.c of using to trigger the indirect inclusion of on mingw. Fixes: 1a4df34a Signed-off-by: Eric Blake --- Pushing under the build-breaker rule src/conf/checkpoint_conf.c | 2 ++ 1 file changed, 2 insertions(+) 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 +#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