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.

Backports commit 121d07125bb6d7079c7ebafdd3efe8c3a01cc440 from qemu
This commit is contained in:
Markus Armbruster 2018-02-25 04:18:40 -05:00 committed by Lioncash
parent 25ec9ab016
commit 9ae2fc4d9e
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
5 changed files with 14 additions and 13 deletions

View file

@ -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

View file

@ -15,8 +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
#include "qemu/osdep.h"
@ -131,4 +131,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 */

View file

@ -8,8 +8,8 @@
*
*/
#ifndef ARM_MISC_H
#define ARM_MISC_H
#ifndef HW_ARM_H
#define HW_ARM_H
#include "exec/memory.h"
#include "target-arm/cpu-qom.h"
@ -20,4 +20,4 @@ void machvirt_machine_init(struct uc_struct *uc); // ARM64
void arm_cpu_register_types(void *opaque);
void aarch64_cpu_register_types(void *opaque);
#endif /* !ARM_MISC_H */
#endif /* HW_ARM_H */

View file

@ -10,8 +10,8 @@
* See the COPYING.LIB file in the top-level directory.
*/
#ifndef QEMU_OBJECTS_H
#define QEMU_OBJECTS_H
#ifndef QAPI_QMP_TYPES_H
#define QAPI_QMP_TYPES_H
#include "qapi/qmp/qobject.h"
#include "qapi/qmp/qint.h"
@ -22,4 +22,4 @@
#include "qapi/qmp/qlist.h"
#include "qapi/qmp/qjson.h"
#endif /* QEMU_OBJECTS_H */
#endif /* QAPI_QMP_TYPES_H */

View file

@ -10,8 +10,9 @@
* See the COPYING.LIB file in the top-level directory.
*
*/
#ifndef QAPI_VISITOR_CORE_H
#define QAPI_VISITOR_CORE_H
#ifndef QAPI_VISITOR_H
#define QAPI_VISITOR_H
#include "qemu/typedefs.h"
#include "qapi/qmp/qobject.h"