[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/18] linux-user: Clean up hostdep.h header guards
|
From: |
Markus Armbruster |
|
Subject: |
[Qemu-devel] [PULL 08/18] linux-user: Clean up hostdep.h header guards |
|
Date: |
Tue, 12 Jul 2016 16:31:24 +0200 |
These headers all use QEMU_HOSTDEP_H as header guard symbol. Reuse of
the same guard symbol in multiple headers is okay as long as they
cannot be included together.
Since we can avoid guard symbol reuse easily, do so: use guard symbol
$target_HOSTDEP_H for linux-user/host/$target/hostdep.h.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
---
linux-user/host/aarch64/hostdep.h | 4 ++--
linux-user/host/arm/hostdep.h | 4 ++--
linux-user/host/i386/hostdep.h | 4 ++--
linux-user/host/ia64/hostdep.h | 4 ++--
linux-user/host/mips/hostdep.h | 4 ++--
linux-user/host/ppc/hostdep.h | 4 ++--
linux-user/host/ppc64/hostdep.h | 4 ++--
linux-user/host/s390/hostdep.h | 4 ++--
linux-user/host/s390x/hostdep.h | 4 ++--
linux-user/host/sparc/hostdep.h | 4 ++--
linux-user/host/sparc64/hostdep.h | 4 ++--
linux-user/host/x32/hostdep.h | 4 ++--
linux-user/host/x86_64/hostdep.h | 4 ++--
13 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/linux-user/host/aarch64/hostdep.h
b/linux-user/host/aarch64/hostdep.h
index b79eaf1..64f75ce 100644
--- a/linux-user/host/aarch64/hostdep.h
+++ b/linux-user/host/aarch64/hostdep.h
@@ -9,8 +9,8 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef AARCH64_HOSTDEP_H
+#define AARCH64_HOSTDEP_H
/* We have a safe-syscall.inc.S */
#define HAVE_SAFE_SYSCALL
diff --git a/linux-user/host/arm/hostdep.h b/linux-user/host/arm/hostdep.h
index 8e1ff2f..5c1ae60 100644
--- a/linux-user/host/arm/hostdep.h
+++ b/linux-user/host/arm/hostdep.h
@@ -9,8 +9,8 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef ARM_HOSTDEP_H
+#define ARM_HOSTDEP_H
/* We have a safe-syscall.inc.S */
#define HAVE_SAFE_SYSCALL
diff --git a/linux-user/host/i386/hostdep.h b/linux-user/host/i386/hostdep.h
index 5a12f4a..d834bd8 100644
--- a/linux-user/host/i386/hostdep.h
+++ b/linux-user/host/i386/hostdep.h
@@ -9,8 +9,8 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef I386_HOSTDEP_H
+#define I386_HOSTDEP_H
/* We have a safe-syscall.inc.S */
#define HAVE_SAFE_SYSCALL
diff --git a/linux-user/host/ia64/hostdep.h b/linux-user/host/ia64/hostdep.h
index 7609bf5..263bf76 100644
--- a/linux-user/host/ia64/hostdep.h
+++ b/linux-user/host/ia64/hostdep.h
@@ -9,7 +9,7 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef IA64_HOSTDEP_H
+#define IA64_HOSTDEP_H
#endif
diff --git a/linux-user/host/mips/hostdep.h b/linux-user/host/mips/hostdep.h
index 7609bf5..ba111d7 100644
--- a/linux-user/host/mips/hostdep.h
+++ b/linux-user/host/mips/hostdep.h
@@ -9,7 +9,7 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef MIPS_HOSTDEP_H
+#define MIPS_HOSTDEP_H
#endif
diff --git a/linux-user/host/ppc/hostdep.h b/linux-user/host/ppc/hostdep.h
index 7609bf5..23d8bd9 100644
--- a/linux-user/host/ppc/hostdep.h
+++ b/linux-user/host/ppc/hostdep.h
@@ -9,7 +9,7 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef PPC_HOSTDEP_H
+#define PPC_HOSTDEP_H
#endif
diff --git a/linux-user/host/ppc64/hostdep.h b/linux-user/host/ppc64/hostdep.h
index 310e7d1..0b0f5f7 100644
--- a/linux-user/host/ppc64/hostdep.h
+++ b/linux-user/host/ppc64/hostdep.h
@@ -9,8 +9,8 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef PPC64_HOSTDEP_H
+#define PPC64_HOSTDEP_H
/* We have a safe-syscall.inc.S */
#define HAVE_SAFE_SYSCALL
diff --git a/linux-user/host/s390/hostdep.h b/linux-user/host/s390/hostdep.h
index 7609bf5..afcba5a 100644
--- a/linux-user/host/s390/hostdep.h
+++ b/linux-user/host/s390/hostdep.h
@@ -9,7 +9,7 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef S390_HOSTDEP_H
+#define S390_HOSTDEP_H
#endif
diff --git a/linux-user/host/s390x/hostdep.h b/linux-user/host/s390x/hostdep.h
index e95871c..6f9da9c 100644
--- a/linux-user/host/s390x/hostdep.h
+++ b/linux-user/host/s390x/hostdep.h
@@ -9,8 +9,8 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef S390X_HOSTDEP_H
+#define S390X_HOSTDEP_H
/* We have a safe-syscall.inc.S */
#define HAVE_SAFE_SYSCALL
diff --git a/linux-user/host/sparc/hostdep.h b/linux-user/host/sparc/hostdep.h
index 7609bf5..391ad92 100644
--- a/linux-user/host/sparc/hostdep.h
+++ b/linux-user/host/sparc/hostdep.h
@@ -9,7 +9,7 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef SPARC_HOSTDEP_H
+#define SPARC_HOSTDEP_H
#endif
diff --git a/linux-user/host/sparc64/hostdep.h
b/linux-user/host/sparc64/hostdep.h
index 7609bf5..ce3968f 100644
--- a/linux-user/host/sparc64/hostdep.h
+++ b/linux-user/host/sparc64/hostdep.h
@@ -9,7 +9,7 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef SPARC64_HOSTDEP_H
+#define SPARC64_HOSTDEP_H
#endif
diff --git a/linux-user/host/x32/hostdep.h b/linux-user/host/x32/hostdep.h
index 7609bf5..2c2d6d3 100644
--- a/linux-user/host/x32/hostdep.h
+++ b/linux-user/host/x32/hostdep.h
@@ -9,7 +9,7 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef X32_HOSTDEP_H
+#define X32_HOSTDEP_H
#endif
diff --git a/linux-user/host/x86_64/hostdep.h b/linux-user/host/x86_64/hostdep.h
index 9dfbf3a..3b42596 100644
--- a/linux-user/host/x86_64/hostdep.h
+++ b/linux-user/host/x86_64/hostdep.h
@@ -9,8 +9,8 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef X86_64_HOSTDEP_H
+#define X86_64_HOSTDEP_H
/* We have a safe-syscall.inc.S */
#define HAVE_SAFE_SYSCALL
--
2.5.5
- [Qemu-devel] [PULL 00/18] Clean up #include "..." vs <...> and header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 07/18] linux-user: Clean up target_structs.h header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 02/18] scripts: New clean-header-guards.pl, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 14/18] libdecnumber: Don't fool around with guards to avoid #include, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 08/18] linux-user: Clean up hostdep.h header guards,
Markus Armbruster <=
- [Qemu-devel] [PULL 18/18] cris: Fix broken header guard in hw/cris/boot.h, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 04/18] linux-user: Clean up target_syscall.h header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 11/18] spapr_pci: Include spapr.h instead of playing games with #error, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 10/18] tcg: Clean up tcg-target.h header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 12/18] Drop Emacs local variables lists redundant with .dir-locals.el, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 09/18] linux-user: Fix broken header guard in syscall_defs.h, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 03/18] target-*: Clean up cpu.h header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 06/18] linux-user: Clean up target_signal.h header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 15/18] libdecnumber: Don't error out on decNumberLocal.h re-inclusion, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 01/18] Use #include "..." for our own headers, <...> for others, Markus Armbruster, 2016/07/12