From nobody Mon Feb 9 18:18:10 2026 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=1560874559; cv=none; d=zoho.com; s=zohoarc; b=mWE7j//HzlJiq9s07fTvRPQ2pxZB2lRyD3JDtbYCSWJ55TbzfAEj/Pjj+0klQ8mcchJLkoAAEcZM/JCKyLfOur/4g4bjONQEftf5FQvxSzVqrgmHooOwhOl94bgk/gQIEmiDB5xTl+asWYLwNJCuzc4guK9GXPHS9zaaSRQ0CpU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560874559; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=MgpZtLzBvo4Vjk+RtpOhpVK1J2WIQzn7wCwD3zAq/UY=; b=bIXLgmGgoTNR0fbbw1Udjx0W5TKBdhHHHm4xREYkc2aj+7vxTwsZPsJCp8ZUtamkMZPd3T4pX1v4ZWWjmgKe99ZAHj1/L0EAGIey5GWaJJpMoDB2aAtkNPW03EXeG5ohpeGElFdI8tMB+5Q00+aLPY6qzkGfnRpR9sOpwJSOUto= 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 1560874559491845.7718151110389; Tue, 18 Jun 2019 09:15:59 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 675003162905; Tue, 18 Jun 2019 16:15:55 +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 4194F5C22F; Tue, 18 Jun 2019 16:15:55 +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 F3AF81806B1A; Tue, 18 Jun 2019 16:15:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x5IGDXIB024299 for ; Tue, 18 Jun 2019 12:13:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3E72A60FAB; Tue, 18 Jun 2019 16:13:33 +0000 (UTC) Received: from aegolius.redhat.com (ovpn-117-198.phx2.redhat.com [10.3.117.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 09D8884EF for ; Tue, 18 Jun 2019 16:13:32 +0000 (UTC) From: Jonathon Jongsma To: libvir-list@redhat.com Date: Tue, 18 Jun 2019 11:12:57 -0500 Message-Id: <20190618161316.1722-28-jjongsma@redhat.com> In-Reply-To: <20190618161316.1722-1-jjongsma@redhat.com> References: <20190618161316.1722-1-jjongsma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 27/46] util: dbus: use #pragma once in headers 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 18 Jun 2019 16:15:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jonathon Jongsma Reviewed-by: J=C3=A1n Tomko --- src/util/virdbus.h | 22 ++++++++++------------ src/util/virdbuspriv.h | 11 ++++------- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/util/virdbus.h b/src/util/virdbus.h index c1e5de31ab..083c074d59 100644 --- a/src/util/virdbus.h +++ b/src/util/virdbus.h @@ -19,19 +19,18 @@ * */ =20 -#ifndef LIBVIRT_VIRDBUS_H -# define LIBVIRT_VIRDBUS_H +#pragma once =20 -# ifdef WITH_DBUS -# undef interface /* Work around namespace pollution in mingw's rpc.h */ -# include -# else -# define DBusConnection void -# define DBusMessage void -# endif -# include "internal.h" +#ifdef WITH_DBUS +# undef interface /* Work around namespace pollution in mingw's rpc.h */ +# include +#else +# define DBusConnection void +# define DBusMessage void +#endif +#include "internal.h" =20 -# include +#include =20 void virDBusSetSharedBus(bool shared); =20 @@ -75,4 +74,3 @@ int virDBusIsServiceEnabled(const char *name); int virDBusIsServiceRegistered(const char *name); =20 bool virDBusErrorIsUnknownMethod(virErrorPtr err); -#endif /* LIBVIRT_VIRDBUS_H */ diff --git a/src/util/virdbuspriv.h b/src/util/virdbuspriv.h index 5c0c7f8b6e..f96f393ff5 100644 --- a/src/util/virdbuspriv.h +++ b/src/util/virdbuspriv.h @@ -23,12 +23,11 @@ # error "virdbuspriv.h may only be included by virdbus.c or test suites" #endif /* LIBVIRT_VIRDBUSPRIV_H_ALLOW */ =20 -#ifndef LIBVIRT_VIRDBUSPRIV_H -# define LIBVIRT_VIRDBUSPRIV_H +#pragma once =20 -# include "virdbus.h" +#include "virdbus.h" =20 -# if defined(WITH_DBUS) && !HAVE_DBUSBASICVALUE +#if defined(WITH_DBUS) && !HAVE_DBUSBASICVALUE /* Copied (and simplified) from dbus 1.6.12, for use with older dbus heade= rs */ typedef union { @@ -42,7 +41,7 @@ typedef union double dbl; /**< as double */ unsigned char byt; /**< as byte */ } DBusBasicValue; -# endif +#endif =20 int virDBusMessageEncodeArgs(DBusMessage* msg, const char *types, @@ -55,5 +54,3 @@ int virDBusMessageDecodeArgs(DBusMessage* msg, int virDBusMessageEncode(DBusMessage* msg, const char *types, ...); - -#endif /* LIBVIRT_VIRDBUSPRIV_H */ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list