From c2ffbc575d8e6126b70d7de88727f7ea431d0b82 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@redhat.com>
Date: Sun, 25 Feb 2018 04:25:59 -0500
Subject: [PATCH] Clean up decorations and whitespace around header guards

Cleaned up with scripts/clean-header-guards.pl.

Backports commit 175de52487ce0b0c78daa4cdf41a5a465a168a25 from qemu
---
 qemu/include/exec/gen-icount.h       | 2 +-
 qemu/include/exec/helper-gen.h       | 2 +-
 qemu/include/exec/helper-proto.h     | 2 +-
 qemu/include/exec/helper-tcg.h       | 2 +-
 qemu/include/fpu/softfloat.h         | 2 +-
 qemu/include/hw/i386/apic_internal.h | 2 +-
 qemu/include/qemu/cutils.h           | 2 +-
 qemu/include/qemu/fprintf-fn.h       | 2 +-
 qemu/include/qemu/host-utils.h       | 3 ++-
 9 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/qemu/include/exec/gen-icount.h b/qemu/include/exec/gen-icount.h
index 0f80741d..b9500a8d 100644
--- a/qemu/include/exec/gen-icount.h
+++ b/qemu/include/exec/gen-icount.h
@@ -1,5 +1,5 @@
 #ifndef GEN_ICOUNT_H
-#define GEN_ICOUNT_H 1
+#define GEN_ICOUNT_H
 
 #include "qemu/timer.h"
 
diff --git a/qemu/include/exec/helper-gen.h b/qemu/include/exec/helper-gen.h
index 49d01e7d..93b989a8 100644
--- a/qemu/include/exec/helper-gen.h
+++ b/qemu/include/exec/helper-gen.h
@@ -2,7 +2,7 @@
    This one expands generation functions for tcg opcodes.  */
 
 #ifndef HELPER_GEN_H
-#define HELPER_GEN_H 1
+#define HELPER_GEN_H
 
 #include "exec/helper-head.h"
 
diff --git a/qemu/include/exec/helper-proto.h b/qemu/include/exec/helper-proto.h
index 5c21c22f..b3634490 100644
--- a/qemu/include/exec/helper-proto.h
+++ b/qemu/include/exec/helper-proto.h
@@ -2,7 +2,7 @@
    This one expands prototypes for the helper functions.  */
 
 #ifndef HELPER_PROTO_H
-#define HELPER_PROTO_H 1
+#define HELPER_PROTO_H
 
 #include "exec/helper-head.h"
 
diff --git a/qemu/include/exec/helper-tcg.h b/qemu/include/exec/helper-tcg.h
index 6c6a4a9a..978fb13f 100644
--- a/qemu/include/exec/helper-tcg.h
+++ b/qemu/include/exec/helper-tcg.h
@@ -2,7 +2,7 @@
    This one defines data structures private to tcg.c.  */
 
 #ifndef HELPER_TCG_H
-#define HELPER_TCG_H 1
+#define HELPER_TCG_H
 
 #include "exec/helper-head.h"
 
diff --git a/qemu/include/fpu/softfloat.h b/qemu/include/fpu/softfloat.h
index a440055a..c2975316 100644
--- a/qemu/include/fpu/softfloat.h
+++ b/qemu/include/fpu/softfloat.h
@@ -773,4 +773,4 @@ static inline int float128_is_any_nan(float128 a)
 *----------------------------------------------------------------------------*/
 float128 float128_default_nan(float_status *status);
 
-#endif /* !SOFTFLOAT_H */
+#endif /* SOFTFLOAT_H */
diff --git a/qemu/include/hw/i386/apic_internal.h b/qemu/include/hw/i386/apic_internal.h
index b528514d..6840d0d0 100644
--- a/qemu/include/hw/i386/apic_internal.h
+++ b/qemu/include/hw/i386/apic_internal.h
@@ -201,4 +201,4 @@ void apic_enable_vapic(struct uc_struct *uc, DeviceState *d, hwaddr paddr);
 void vapic_report_tpr_access(DeviceState *dev, CPUState *cpu, target_ulong ip,
                              TPRAccess access);
 
-#endif /* !QEMU_APIC_INTERNAL_H */
+#endif /* QEMU_APIC_INTERNAL_H */
diff --git a/qemu/include/qemu/cutils.h b/qemu/include/qemu/cutils.h
index 2638d387..12856a48 100644
--- a/qemu/include/qemu/cutils.h
+++ b/qemu/include/qemu/cutils.h
@@ -1,5 +1,5 @@
 #ifndef QEMU_CUTILS_H
-#define QEMU_CUTILS_H 1
+#define QEMU_CUTILS_H
 
 #include "qemu/fprintf-fn.h"
 
diff --git a/qemu/include/qemu/fprintf-fn.h b/qemu/include/qemu/fprintf-fn.h
index 9ddc90f1..6ff669bf 100644
--- a/qemu/include/qemu/fprintf-fn.h
+++ b/qemu/include/qemu/fprintf-fn.h
@@ -6,7 +6,7 @@
  */
 
 #ifndef QEMU_FPRINTF_FN_H
-#define QEMU_FPRINTF_FN_H 1
+#define QEMU_FPRINTF_FN_H
 
 #include "qemu/compiler.h"
 #include <stdio.h>
diff --git a/qemu/include/qemu/host-utils.h b/qemu/include/qemu/host-utils.h
index 57a97f48..e4dc5ee7 100644
--- a/qemu/include/qemu/host-utils.h
+++ b/qemu/include/qemu/host-utils.h
@@ -22,8 +22,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #ifndef HOST_UTILS_H
-#define HOST_UTILS_H 1
+#define HOST_UTILS_H
 
 #include "qemu/compiler.h"   /* QEMU_GNUC_PREREQ */
 #include "qemu/bswap.h"