diff options
| author | Markus Armbruster <armbru@redhat.com> | 2019-06-04 20:16:15 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2019-06-12 13:20:20 +0200 |
| commit | 0553d895f98d6ffa7354dee324ff7a65fca3367f (patch) | |
| tree | 1bd0b187a8e4aa421d7af3e01ca3d18c80a5c2eb /include/hw/arm | |
| parent | a8d2532645cf5ce4f75981f81dfe363efc35d05c (diff) | |
Normalize position of header guard
This is the common header guard idiom:
/*
* File comment
*/
#ifndef GUARD_SYMBOL_H
#define GUARD_SYMBOL_H
... actual contents ...
#endif
A few of our headers have some #include before the guard.
target/tilegx/spr_def_64.h has #ifndef __DOXYGEN__ outside the guard.
A few more have the #define elsewhere.
Change them to match the common idiom. For spr_def_64.h, that means
dropping #ifndef __DOXYGEN__. While there, rename guard symbols to
make scripts/clean-header-guards.pl happy.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190604181618.19980-2-armbru@redhat.com>
[Rebased with conflicts resolved automatically]
Diffstat (limited to 'include/hw/arm')
| -rw-r--r-- | include/hw/arm/allwinner-a10.h | 4 | ||||
| -rw-r--r-- | include/hw/arm/omap.h | 8 | ||||
| -rw-r--r-- | include/hw/arm/xlnx-zynqmp.h | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/include/hw/arm/allwinner-a10.h b/include/hw/arm/allwinner-a10.h index bbfbaf01c7..e99fe2ea2e 100644 --- a/include/hw/arm/allwinner-a10.h +++ b/include/hw/arm/allwinner-a10.h @@ -1,4 +1,5 @@ -#ifndef ALLWINNER_H_ +#ifndef HW_ARM_ALLWINNER_A10_H +#define HW_ARM_ALLWINNER_A10_H #include "qemu/error-report.h" #include "hw/char/serial.h" @@ -37,5 +38,4 @@ typedef struct AwA10State { MemoryRegion sram_a; } AwA10State; -#define ALLWINNER_H_ #endif diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index 9de867daa4..d21e418242 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -16,9 +16,11 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef hw_omap_h + +#ifndef HW_ARM_OMAP_H +#define HW_ARM_OMAP_H + #include "exec/memory.h" -# define hw_omap_h "omap.h" #include "hw/irq.h" #include "hw/input/tsc2xxx.h" #include "target/arm/cpu-qom.h" @@ -991,4 +993,4 @@ enum { # define OMAP_MPUI_REG_MASK 0x000007ff -#endif /* hw_omap_h */ +#endif diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h index 1b17f13b0b..35804ea80a 100644 --- a/include/hw/arm/xlnx-zynqmp.h +++ b/include/hw/arm/xlnx-zynqmp.h @@ -16,6 +16,7 @@ */ #ifndef XLNX_ZYNQMP_H +#define XLNX_ZYNQMP_H #include "hw/arm/boot.h" #include "hw/intc/arm_gic.h" @@ -113,5 +114,4 @@ typedef struct XlnxZynqMPState { bool has_rpu; } XlnxZynqMPState; -#define XLNX_ZYNQMP_H #endif |