On Tue, Jun 18, 2019 at 11:13:13AM -0500, Jonathon Jongsma wrote:
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/xenapi/xenapi_driver.h | 5 +----
src/xenapi/xenapi_driver_private.h | 17 +++++++----------
src/xenapi/xenapi_utils.h | 15 ++++++---------
src/xenconfig/xen_common.h | 17 +++++++----------
src/xenconfig/xen_sxpr.h | 13 +++++--------
src/xenconfig/xen_xl.h | 11 ++++-------
src/xenconfig/xen_xm.h | 9 ++++-----
src/xenconfig/xenxs_private.h | 29 +++++++++++++----------------
8 files changed, 47 insertions(+), 69 deletions(-)
diff --git a/src/xenconfig/xen_xm.h b/src/xenconfig/xen_xm.h
index b0a73fc09b..a2cc6715b4 100644
--- a/src/xenconfig/xen_xm.h
+++ b/src/xenconfig/xen_xm.h
@@ -20,12 +20,11 @@
* <
http://www.gnu.org/licenses/>.
*/
-#ifndef LIBVIRT_XEN_XM_H
-# define LIBVIRT_XEN_XM_H
+#pragma once
-# include "internal.h"
-# include "virconf.h"
-# include "domain_conf.h"
+#include "internal.h"
+#include "virconf.h"
+#include "domain_conf.h"
virConfPtr xenFormatXM(virConnectPtr conn, virDomainDefPtr def);
This also needs:
diff --git a/src/xenconfig/xen_xm.h b/src/xenconfig/xen_xm.h
index a2cc6715b4..5546b2ddf4 100644
--- a/src/xenconfig/xen_xm.h
+++ b/src/xenconfig/xen_xm.h
@@ -30,5 +30,3 @@ virConfPtr xenFormatXM(virConnectPtr conn, virDomainDefPtr def);
virDomainDefPtr xenParseXM(virConfPtr conf,
virCapsPtr caps, virDomainXMLOptionPtr xmlopt);
-
-#endif /* LIBVIRT_XEN_XM_H */
With that fixed:
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano