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.

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>
Message-Id: <20190315145123.28030-6-armbru@redhat.com>
[Rebase to master: update include/hw/net/ne2000-isa.h]
This commit is contained in:
Markus Armbruster 2019-03-15 15:51:20 +01:00
parent 814167479a
commit 58ea30f514
30 changed files with 85 additions and 80 deletions

View file

@ -23,8 +23,8 @@
* THE SOFTWARE.
*/
#ifndef HEATHROW_H
#define HEATHROW_H
#ifndef HW_INTC_HEATHROW_PIC_H
#define HW_INTC_HEATHROW_PIC_H
#define TYPE_HEATHROW "heathrow"
#define HEATHROW(obj) OBJECT_CHECK(HeathrowState, (obj), TYPE_HEATHROW)
@ -46,4 +46,4 @@ typedef struct HeathrowState {
#define HEATHROW_NUM_IRQS 64
#endif /* HEATHROW_H */
#endif /* HW_INTC_HEATHROW_PIC_H */

View file

@ -22,8 +22,8 @@
* THE SOFTWARE.
*/
#ifndef XLNX_PMU_IO_INTC_H
#define XLNX_PMU_IO_INTC_H
#ifndef HW_INTC_XLNX_PMU_IOMOD_INTC_H
#define HW_INTC_XLNX_PMU_IOMOD_INTC_H
#include "hw/sysbus.h"
#include "hw/register.h"
@ -54,4 +54,4 @@ typedef struct XlnxPMUIOIntc {
RegisterInfo regs_info[XLNXPMUIOINTC_R_MAX];
} XlnxPMUIOIntc;
#endif /* XLNX_PMU_IO_INTC_H */
#endif /* HW_INTC_XLNX_PMU_IOMOD_INTC_H */