[libvirt] [PATCH 37/46] util: scsi: use #pragma once in headers
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/util/virscsi.h | 11 ++++-------
src/util/virscsihost.h | 7 ++-----
src/util/virscsivhost.h | 13 +++++--------
3 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/src/util/virscsi.h b/src/util/virscsi.h
index 907948455e..6cc68835b7 100644
--- a/src/util/virscsi.h
+++ b/src/util/virscsi.h
@@ -18,12 +18,11 @@
* <http://www.gnu.org/licenses/>;.
*/
-#ifndef LIBVIRT_VIRSCSI_H
-# define LIBVIRT_VIRSCSI_H
+#pragma once
-# include "internal.h"
-# include "virobject.h"
-# include "virautoclean.h"
+#include "internal.h"
+#include "virobject.h"
+#include "virautoclean.h"
typedef struct _virSCSIDevice virSCSIDevice;
typedef virSCSIDevice *virSCSIDevicePtr;
@@ -94,5 +93,3 @@ virSCSIDevicePtr virSCSIDeviceListFind(virSCSIDeviceListPtr list,
virSCSIDevicePtr dev);
VIR_DEFINE_AUTOPTR_FUNC(virSCSIDevice, virSCSIDeviceFree);
-
-#endif /* LIBVIRT_VIRSCSI_H */
diff --git a/src/util/virscsihost.h b/src/util/virscsihost.h
index 1e8b8803ce..ccc10f772d 100644
--- a/src/util/virscsihost.h
+++ b/src/util/virscsihost.h
@@ -16,10 +16,9 @@
* <http://www.gnu.org/licenses/>;.
*/
-#ifndef LIBVIRT_VIRSCSIHOST_H
-# define LIBVIRT_VIRSCSIHOST_H
+#pragma once
-# include "internal.h"
+#include "internal.h"
int virSCSIHostGetUniqueId(const char *sysfs_prefix, int host);
@@ -36,5 +35,3 @@ char *virSCSIHostGetNameByParentaddr(unsigned int domain,
unsigned int slot,
unsigned int function,
unsigned int unique_id);
-
-#endif /* LIBVIRT_VIRSCSIHOST_H */
diff --git a/src/util/virscsivhost.h b/src/util/virscsivhost.h
index 7349db378e..a1a0ea5618 100644
--- a/src/util/virscsivhost.h
+++ b/src/util/virscsivhost.h
@@ -18,13 +18,12 @@
* <http://www.gnu.org/licenses/>;.
*/
-#ifndef LIBVIRT_VIRSCSIVHOST_H
-# define LIBVIRT_VIRSCSIVHOST_H
+#pragma once
-# include "internal.h"
-# include "virobject.h"
-# include "virutil.h"
-# include "virautoclean.h"
+#include "internal.h"
+#include "virobject.h"
+#include "virutil.h"
+#include "virautoclean.h"
typedef struct _virSCSIVHostDevice virSCSIVHostDevice;
typedef virSCSIVHostDevice *virSCSIVHostDevicePtr;
@@ -62,5 +61,3 @@ void virSCSIVHostDeviceFree(virSCSIVHostDevicePtr dev);
int virSCSIVHostOpenVhostSCSI(int *vhostfd) ATTRIBUTE_NOINLINE;
VIR_DEFINE_AUTOPTR_FUNC(virSCSIVHostDevice, virSCSIVHostDeviceFree);
-
-#endif /* LIBVIRT_VIRSCSIVHOST_H */
--
2.20.1