[libvirt] [PATCH 05/46] src/openvz: use #pragma once in headers

[Jonathon Jongsma]

Signed-off-by: Jonathon Jongsma <jjongsma at redhat.com>
---
 src/openvz/openvz_conf.h   | 21 +++++++++------------
 src/openvz/openvz_driver.h | 11 ++++-------
 src/openvz/openvz_util.h   |  5 +----
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/src/openvz/openvz_conf.h b/src/openvz/openvz_conf.h
index 05ccd6f927..cd42d697ce 100644
--- a/src/openvz/openvz_conf.h
+++ b/src/openvz/openvz_conf.h
@@ -21,21 +21,20 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_OPENVZ_CONF_H
-# define LIBVIRT_OPENVZ_CONF_H
+#pragma once
 
-# include "internal.h"
-# include "virdomainobjlist.h"
-# include "virthread.h"
+#include "internal.h"
+#include "virdomainobjlist.h"
+#include "virthread.h"
 
 
 /* OpenVZ commands - Replace with wrapper scripts later? */
-# define VZLIST         "/usr/sbin/vzlist"
-# define VZCTL          "/usr/sbin/vzctl"
-# define VZMIGRATE      "/usr/sbin/vzmigrate"
-# define VZ_CONF_FILE   "/etc/vz/vz.conf"
+#define VZLIST         "/usr/sbin/vzlist"
+#define VZCTL          "/usr/sbin/vzctl"
+#define VZMIGRATE      "/usr/sbin/vzmigrate"
+#define VZ_CONF_FILE   "/etc/vz/vz.conf"
 
-# define VZCTL_BRIDGE_MIN_VERSION ((3 * 1000 * 1000) + (0 * 1000) + 22 + 1)
+#define VZCTL_BRIDGE_MIN_VERSION ((3 * 1000 * 1000) + (0 * 1000) + 22 + 1)
 
 struct openvz_driver {
     virMutex lock;
@@ -64,5 +63,3 @@ int strtoI(const char *str);
 int openvzSetDefinedUUID(int vpsid, unsigned char *uuid);
 int openvzGetVEID(const char *name);
 int openvzReadNetworkConf(virDomainDefPtr def, int veid);
-
-#endif /* LIBVIRT_OPENVZ_CONF_H */
diff --git a/src/openvz/openvz_driver.h b/src/openvz/openvz_driver.h
index dd2cfd900e..1570fd82ac 100644
--- a/src/openvz/openvz_driver.h
+++ b/src/openvz/openvz_driver.h
@@ -20,21 +20,18 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_OPENVZ_DRIVER_H
-# define LIBVIRT_OPENVZ_DRIVER_H
+#pragma once
 
-# include "internal.h"
+#include "internal.h"
 
-# define OPENVZ_MIGRATION_FLAGS \
+#define OPENVZ_MIGRATION_FLAGS \
     (VIR_MIGRATE_LIVE)
 
 /* All supported migration parameters and their types. */
-# define OPENVZ_MIGRATION_PARAMETERS \
+#define OPENVZ_MIGRATION_PARAMETERS \
     VIR_MIGRATE_PARAM_URI,              VIR_TYPED_PARAM_STRING, \
     VIR_MIGRATE_PARAM_DEST_NAME,        VIR_TYPED_PARAM_STRING, \
     VIR_MIGRATE_PARAM_DEST_XML,         VIR_TYPED_PARAM_STRING, \
     NULL
 
 int openvzRegister(void);
-
-#endif /* LIBVIRT_OPENVZ_DRIVER_H */
diff --git a/src/openvz/openvz_util.h b/src/openvz/openvz_util.h
index bc3247119a..a1f046c5d2 100644
--- a/src/openvz/openvz_util.h
+++ b/src/openvz/openvz_util.h
@@ -19,10 +19,7 @@
  *
  */
 
-#ifndef LIBVIRT_OPENVZ_UTIL_H
-# define LIBVIRT_OPENVZ_UTIL_H
+#pragma once
 
 long openvzKBPerPages(void);
 char *openvzVEGetStringParam(virDomainPtr dom, const char *param);
-
-#endif /* LIBVIRT_OPENVZ_UTIL_H */
-- 
2.20.1