diff --git a/src/util/virdbus.h b/src/util/virdbus.h index c1e5de31abd117175f15928c2d846f3d83cd9789..083c074d590d41bc7d820bc7246dfb0bcb5af9b6 100644 --- a/src/util/virdbus.h +++ b/src/util/virdbus.h @@ -19,19 +19,18 @@ * */ -#ifndef LIBVIRT_VIRDBUS_H -# define LIBVIRT_VIRDBUS_H +#pragma once -# 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" -# include +#include void virDBusSetSharedBus(bool shared); @@ -75,4 +74,3 @@ int virDBusIsServiceEnabled(const char *name); int virDBusIsServiceRegistered(const char *name); bool virDBusErrorIsUnknownMethod(virErrorPtr err); -#endif /* LIBVIRT_VIRDBUS_H */ diff --git a/src/util/virdbuspriv.h b/src/util/virdbuspriv.h index 5c0c7f8b6eafe0f62b0e8217b1561d199142ee8f..f96f393ff5d060972df1c4c39b4c33dbfb845479 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 */ -#ifndef LIBVIRT_VIRDBUSPRIV_H -# define LIBVIRT_VIRDBUSPRIV_H +#pragma once -# include "virdbus.h" +#include "virdbus.h" -# 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 headers */ typedef union { @@ -42,7 +41,7 @@ typedef union double dbl; /**< as double */ unsigned char byt; /**< as byte */ } DBusBasicValue; -# endif +#endif 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 */