[PATCH 28/46] util: command: use #pragma once in headers

[Jonathon Jongsma <jjongsma@xxxxxxxxxx>]

Signed-off-by: Jonathon Jongsma <jjongsma@xxxxxxxxxx>
---
 src/util/vircommand.h     | 11 ++++-------
 src/util/vircommandpriv.h |  7 ++-----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/util/vircommand.h b/src/util/vircommand.h
index c03da43f25..c9a8d3c41c 100644
--- a/src/util/vircommand.h
+++ b/src/util/vircommand.h
@@ -19,12 +19,11 @@
  *
  */
 
-#ifndef LIBVIRT_VIRCOMMAND_H
-# define LIBVIRT_VIRCOMMAND_H
+#pragma once
 
-# include "internal.h"
-# include "virbuffer.h"
-# include "virautoclean.h"
+#include "internal.h"
+#include "virbuffer.h"
+#include "virautoclean.h"
 
 typedef struct _virCommand virCommand;
 typedef virCommand *virCommandPtr;
@@ -222,5 +221,3 @@ int virCommandRunNul(virCommandPtr cmd,
                      void *data);
 
 VIR_DEFINE_AUTOPTR_FUNC(virCommand, virCommandFree);
-
-#endif /* LIBVIRT_VIRCOMMAND_H */
diff --git a/src/util/vircommandpriv.h b/src/util/vircommandpriv.h
index e2f4c19596..80f1d1376c 100644
--- a/src/util/vircommandpriv.h
+++ b/src/util/vircommandpriv.h
@@ -23,10 +23,9 @@
 # error "vircommandpriv.h may only be included by vircommand.c or test suites"
 #endif /* LIBVIRT_VIRCOMMANDPRIV_H_ALLOW */
 
-#ifndef LIBVIRT_VIRCOMMANDPRIV_H
-# define LIBVIRT_VIRCOMMANDPRIV_H
+#pragma once
 
-# include "vircommand.h"
+#include "vircommand.h"
 
 typedef void (*virCommandDryRunCallback)(const char *const*args,
                                          const char *const*env,
@@ -39,5 +38,3 @@ typedef void (*virCommandDryRunCallback)(const char *const*args,
 void virCommandSetDryRun(virBufferPtr buf,
                          virCommandDryRunCallback cb,
                          void *opaque);
-
-#endif /* LIBVIRT_VIRCOMMANDPRIV_H */
-- 
2.20.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list