External/libvirt
1
0
Fork 0
Code

util: dbus: use #pragma once in headers

Browse Source 
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jonathon Jongsma 2019-06-18 11:12:57 -05:00 committed by Ján Tomko
parent e7bacd3db9
commit c664bbff2a
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/util/virdbus.h
View File

@ -19,19 +19,18 @@
* *
*/ */
#ifndef LIBVIRT_VIRDBUS_H #pragma once
# define LIBVIRT_VIRDBUS_H
# ifdef WITH_DBUS #ifdef WITH_DBUS
# undef interface /* Work around namespace pollution in mingw's rpc.h */ # undef interface /* Work around namespace pollution in mingw's rpc.h */
# include <dbus/dbus.h> # include <dbus/dbus.h>
# else #else
# define DBusConnection void # define DBusConnection void
# define DBusMessage void # define DBusMessage void
# endif #endif
# include "internal.h" #include "internal.h"
# include <stdarg.h> #include <stdarg.h>
void virDBusSetSharedBus(bool shared); void virDBusSetSharedBus(bool shared);
@ -75,4 +74,3 @@ int virDBusIsServiceEnabled(const char *name);
int virDBusIsServiceRegistered(const char *name); int virDBusIsServiceRegistered(const char *name);
bool virDBusErrorIsUnknownMethod(virErrorPtr err); bool virDBusErrorIsUnknownMethod(virErrorPtr err);
#endif /* LIBVIRT_VIRDBUS_H */

11
src/util/virdbuspriv.h
View File

@ -23,12 +23,11 @@
# error "virdbuspriv.h may only be included by virdbus.c or test suites" # error "virdbuspriv.h may only be included by virdbus.c or test suites"
#endif /* LIBVIRT_VIRDBUSPRIV_H_ALLOW */ #endif /* LIBVIRT_VIRDBUSPRIV_H_ALLOW */
#ifndef LIBVIRT_VIRDBUSPRIV_H #pragma once
# define LIBVIRT_VIRDBUSPRIV_H
# 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 */ /* Copied (and simplified) from dbus 1.6.12, for use with older dbus headers */
typedef union typedef union
{ {
@ -42,7 +41,7 @@ typedef union
double dbl; /**< as double */ double dbl; /**< as double */
unsigned char byt; /**< as byte */ unsigned char byt; /**< as byte */
} DBusBasicValue; } DBusBasicValue;
# endif #endif
int virDBusMessageEncodeArgs(DBusMessage* msg, int virDBusMessageEncodeArgs(DBusMessage* msg,
const char *types, const char *types,
@ -55,5 +54,3 @@ int virDBusMessageDecodeArgs(DBusMessage* msg,
int virDBusMessageEncode(DBusMessage* msg, int virDBusMessageEncode(DBusMessage* msg,
const char *types, const char *types,
...); ...);
#endif /* LIBVIRT_VIRDBUSPRIV_H */