aboutsummaryrefslogtreecommitdiff
path: root/include/exec
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2016-06-29 10:12:57 +0200
committerMarkus Armbruster <armbru@redhat.com>2016-07-12 16:19:16 +0200
commit121d07125bb6d7079c7ebafdd3efe8c3a01cc440 (patch)
treef6201b5906fcb3bfd73aeb1ce74e104249b41c27 /include/exec
parent85aad98a0e0a93c146fd4c306114f23824a3db5f (diff)
Clean up header guards that don't match their file name
Header guard symbols should match their file name to make guard collisions less likely. Offenders found with scripts/clean-header-guards.pl -vn. Cleaned up with scripts/clean-header-guards.pl, followed by some renaming of new guard symbols picked by the script to better ones. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'include/exec')
-rw-r--r--include/exec/address-spaces.h4
-rw-r--r--include/exec/helper-head.h7
-rw-r--r--include/exec/user/abitypes.h5
3 files changed, 8 insertions, 8 deletions
diff --git a/include/exec/address-spaces.h b/include/exec/address-spaces.h
index 3d12cddeec..db8bfa9a92 100644
--- a/include/exec/address-spaces.h
+++ b/include/exec/address-spaces.h
@@ -11,8 +11,8 @@
*
*/
-#ifndef EXEC_MEMORY_H
-#define EXEC_MEMORY_H
+#ifndef EXEC_ADDRESS_SPACES_H
+#define EXEC_ADDRESS_SPACES_H
/*
* Internal interfaces between memory.c/exec.c/vl.c. Do not #include unless
diff --git a/include/exec/helper-head.h b/include/exec/helper-head.h
index 74f8f039d8..1cfc43b9ff 100644
--- a/include/exec/helper-head.h
+++ b/include/exec/helper-head.h
@@ -15,9 +15,8 @@
GEN_HELPER 2 to do runtime registration helper functions.
*/
-#ifndef DEF_HELPER_H
-#define DEF_HELPER_H 1
-
+#ifndef EXEC_HELPER_HEAD_H
+#define EXEC_HELPER_HEAD_H
#define HELPER(name) glue(helper_, name)
@@ -133,4 +132,4 @@
/* MAX_OPC_PARAM_IARGS must be set to n if last entry is DEF_HELPER_FLAGS_n. */
-#endif /* DEF_HELPER_H */
+#endif /* EXEC_HELPER_HEAD_H */
diff --git a/include/exec/user/abitypes.h b/include/exec/user/abitypes.h
index 80eedaccff..a09d6c64ff 100644
--- a/include/exec/user/abitypes.h
+++ b/include/exec/user/abitypes.h
@@ -1,5 +1,6 @@
-#ifndef QEMU_TYPES_H
-#define QEMU_TYPES_H
+#ifndef EXEC_USER_ABITYPES_H
+#define EXEC_USER_ABITYPES_H
+
#include "cpu.h"
#ifdef TARGET_ABI32