Finish moving header guards to #pragma once

[libvirt] [PATCH 40/46] src/vmware: use #pragma once in headers

Posted by Jonathon Jongsma 6 years, 7 months ago

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
---
 src/vmware/vmware_conf.h   | 19 ++++++++-----------
 src/vmware/vmware_driver.h |  5 +----
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/vmware/vmware_conf.h b/src/vmware/vmware_conf.h
index 93b424ef2f..deeed22300 100644
--- a/src/vmware/vmware_conf.h
+++ b/src/vmware/vmware_conf.h
@@ -18,18 +18,17 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VMWARE_CONF_H
-# define LIBVIRT_VMWARE_CONF_H
+#pragma once
 
-# define NOGUI "nogui"
+#define NOGUI "nogui"
 
-# include "internal.h"
-# include "virdomainobjlist.h"
-# include "virthread.h"
-# include "virenum.h"
+#include "internal.h"
+#include "virdomainobjlist.h"
+#include "virthread.h"
+#include "virenum.h"
 
-# define VIR_FROM_THIS VIR_FROM_VMWARE
-# define PROGRAM_SENTINEL ((char *)0x1)
+#define VIR_FROM_THIS VIR_FROM_VMWARE
+#define PROGRAM_SENTINEL ((char *)0x1)
 
 enum vmwareDriverType {
     VMWARE_DRIVER_PLAYER      = 0, /* VMware Player */
@@ -85,5 +84,3 @@ int vmwareMakePath(char *srcDir, char *srcName, char *srcExt,
 int vmwareExtractPid(const char * vmxPath);
 
 char *vmwareCopyVMXFileName(const char *datastorePath, void *opaque);
-
-#endif /* LIBVIRT_VMWARE_CONF_H */
diff --git a/src/vmware/vmware_driver.h b/src/vmware/vmware_driver.h
index e66d222a51..1b28db5977 100644
--- a/src/vmware/vmware_driver.h
+++ b/src/vmware/vmware_driver.h
@@ -16,9 +16,6 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VMWARE_DRIVER_H
-# define LIBVIRT_VMWARE_DRIVER_H
+#pragma once
 
 int vmwareRegister(void);
-
-#endif /* LIBVIRT_VMWARE_DRIVER_H */
-- 
2.20.1

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

Re: [libvirt] [PATCH 40/46] src/vmware: use #pragma once in headers

Posted by Ján Tomko 6 years, 7 months ago

On Tue, Jun 18, 2019 at 11:13:10AM -0500, Jonathon Jongsma wrote:
>Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
>---
> src/vmware/vmware_conf.h   | 19 ++++++++-----------
> src/vmware/vmware_driver.h |  5 +----
> 2 files changed, 9 insertions(+), 15 deletions(-)
>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

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