Commit 58ea30f5 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20190315145123.28030-6-armbru@redhat.com>
[Rebase to master: update include/hw/net/ne2000-isa.h]
parent 81416747

contrib/elf2dmp/qemu_elf.h

+3 −3
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ 
 *

 */



#ifndef ELF2DMP_ELF_H

#define ELF2DMP_ELF_H

#ifndef EMPF2DMP_QEMU_ELF_H

#define EMPF2DMP_QEMU_ELF_H



#include "elf.h"
@@ -47,4 +47,4 @@ void QEMU_Elf_exit(QEMU_Elf *qe); 
Elf64_Phdr *elf64_getphdr(void *map);

Elf64_Half elf_getphdrnum(void *map);



#endif /* ELF2DMP_ELF_H */
 
#endif /* ELF2DMP_QEMU_ELF_H */

disas/nanomips.h

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
 *

 */



#ifndef NANOMIPS_DISASSEMBLER_H

#define NANOMIPS_DISASSEMBLER_H

#ifndef DISAS_NANOMIPS_H

#define DISAS_NANOMIPS_H



#include <string>

fsdev/qemu-fsdev-throttle.h

+4 −3
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 
 *

 */



#ifndef _FSDEV_THROTTLE_H

#define _FSDEV_THROTTLE_H

#ifndef QEMU_FSDEV_THROTTLE_H

#define QEMU_FSDEV_THROTTLE_H



#include "block/aio.h"

#include "qemu/main-loop.h"
@@ -35,4 +35,5 @@ void coroutine_fn fsdev_co_throttle_request(FsThrottle *, bool , 
                                            struct iovec *, int);



void fsdev_throttle_cleanup(FsThrottle *);

#endif /* _FSDEV_THROTTLE_H */
 


#endif /* QEMU_FSDEV_THROTTLE_H */

hw/arm/smmuv3-internal.h

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
 * with this program; if not, see <http://www.gnu.org/licenses/>.

 */



#ifndef HW_ARM_SMMU_V3_INTERNAL_H

#define HW_ARM_SMMU_V3_INTERNAL_H

#ifndef HW_ARM_SMMUV3_INTERNAL_H

#define HW_ARM_SMMUV3_INTERNAL_H



#include "hw/arm/smmu-common.h"

hw/display/vga_regs.h

+3 −3
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
 *

 */



#ifndef LINUX_VIDEO_VGA_H

#define LINUX_VIDEO_VGA_H

#ifndef HW_VGA_REGS_H

#define HW_VGA_REGS_H



/* Some of the code below is taken from SVGAlib.  The original,

   unmodified copyright notice for that code is below. */
@@ -156,4 +156,4 @@ 
/* VGA graphics controller bit masks */

#define VGA_GR06_GRAPHICS_MODE  0x01



#endif /* LINUX_VIDEO_VGA_H */
 
#endif /* HW_VGA_REGS_H */