From 71f714aa968bf6b0fa811a59445a7fb3f9befc23 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 29 May 2015 16:50:48 +0200
Subject: avoid reserved identifiers for header guards

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 include/const.h           | 6 +++---
 include/e820.h            | 6 +++---
 include/fw_cfg.h          | 4 ++--
 include/ioport.h          | 4 ++--
 include/pci.h             | 4 ++--
 include/processor-flags.h | 6 +++---
 include/segment.h         | 4 ++--
 include/string.h          | 4 ++--
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/include/const.h b/include/const.h
index 3d5213f..18f2350 100644
--- a/include/const.h
+++ b/include/const.h
@@ -1,7 +1,7 @@
 /* const.h: Macros for dealing with constants.  */
 
-#ifndef _LINUX_CONST_H
-#define _LINUX_CONST_H
+#ifndef BIOS_CONST_H
+#define BIOS_CONST_H
 
 /* Some constant macros are used in both assembler and
  * C code.  Therefore we cannot annotate them always with
@@ -24,4 +24,4 @@
 #define BITUL(x)	(_AC(1,UL) << (x))
 #define BITULL(x)	(_AC(1,ULL) << (x))
 
-#endif /* !(_LINUX_CONST_H) */
+#endif /* BIOS_CONST_H */
diff --git a/include/e820.h b/include/e820.h
index 60483e8..09b8f01 100644
--- a/include/e820.h
+++ b/include/e820.h
@@ -1,5 +1,5 @@
-#ifndef _UAPI_ASM_X86_E820_H
-#define _UAPI_ASM_X86_E820_H
+#ifndef BIOS_E820_H
+#define BIOS_E820_H
 
 #define SMAP    0x534d4150	/* ASCII "SMAP" */
 
@@ -41,4 +41,4 @@ extern struct e820map *e820;
 #define BIOS_ROM_END		0xffffffff
 
 
-#endif /* _UAPI_ASM_X86_E820_H */
+#endif /* BIOS_E820_H */
diff --git a/include/fw_cfg.h b/include/fw_cfg.h
index a846812..48234f5 100644
--- a/include/fw_cfg.h
+++ b/include/fw_cfg.h
@@ -1,5 +1,5 @@
-#ifndef _FW_CFG_H
-#define _FW_CFG_H 1
+#ifndef BIOS_FW_CFG_H
+#define BIOS_FW_CFG_H 1
 
 // List of QEMU fw_cfg entries.  DO NOT ADD MORE.  (All new content
 // should be passed via the fw_cfg "file" interface.)
diff --git a/include/ioport.h b/include/ioport.h
index 208be41..08a8dbd 100644
--- a/include/ioport.h
+++ b/include/ioport.h
@@ -1,5 +1,5 @@
-#ifndef _IOPORT_H
-#define _IOPORT_H 1
+#ifndef BIOS_IOPORT_H
+#define BIOS_IOPORT_H 1
 
 static inline void outsb(unsigned short port, void *buf, int len)
 {
diff --git a/include/pci.h b/include/pci.h
index 6270ac4..bb37b86 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -1,5 +1,5 @@
-#ifndef _PCI_H
-#define _PCI_H
+#ifndef BIOS_PCI_H
+#define BIOS_PCI_H
 
 #include "ioport.h"
 
diff --git a/include/processor-flags.h b/include/processor-flags.h
index 2725d27..d56cc83 100644
--- a/include/processor-flags.h
+++ b/include/processor-flags.h
@@ -1,5 +1,5 @@
-#ifndef _UAPI_ASM_X86_PROCESSOR_FLAGS_H
-#define _UAPI_ASM_X86_PROCESSOR_FLAGS_H
+#ifndef BIOS_X86_PROCESSOR_FLAGS_H
+#define BIOS_X86_PROCESSOR_FLAGS_H
 /* Various flags defined: can be included from assembler. */
 
 #include "const.h"
@@ -150,4 +150,4 @@
 #define CX86_RCR_BASE	0xdc
 
 
-#endif /* _UAPI_ASM_X86_PROCESSOR_FLAGS_H */
+#endif /* BIOS_X86_PROCESSOR_FLAGS_H */
diff --git a/include/segment.h b/include/segment.h
index 7b68706..18afb53 100644
--- a/include/segment.h
+++ b/include/segment.h
@@ -1,5 +1,5 @@
-#ifndef KVM_SEGMENT_H
-#define KVM_SEGMENT_H
+#ifndef BIOS_SEGMENT_H
+#define BIOS_SEGMENT_H
 
 static inline uint32_t segment_to_flat(uint16_t selector, uint16_t offset)
 {
diff --git a/include/string.h b/include/string.h
index 9b0b8af..fb20869 100644
--- a/include/string.h
+++ b/include/string.h
@@ -1,5 +1,5 @@
-#ifndef _STRING_H
-#define _STRING_H
+#ifndef BIOS_STRING_H
+#define BIOS_STRING_H
 
 #include <stddef.h>
 
-- 
cgit v1.1