[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/18] linux-user: Clean up target_structs.h header
|
From: |
Markus Armbruster |
|
Subject: |
[Qemu-devel] [PATCH 07/18] linux-user: Clean up target_structs.h header guards |
|
Date: |
Wed, 29 Jun 2016 17:55:54 +0200 |
These headers all use TARGET_STRUCTS_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_TARGET_STRUCTS_H for linux-user/$target/target_structs.h.
Signed-off-by: Markus Armbruster <address@hidden>
---
linux-user/aarch64/target_structs.h | 4 ++--
linux-user/alpha/target_structs.h | 4 ++--
linux-user/arm/target_structs.h | 4 ++--
linux-user/cris/target_structs.h | 4 ++--
linux-user/i386/target_structs.h | 4 ++--
linux-user/m68k/target_structs.h | 4 ++--
linux-user/microblaze/target_structs.h | 4 ++--
linux-user/mips/target_structs.h | 4 ++--
linux-user/openrisc/target_structs.h | 4 ++--
linux-user/ppc/target_structs.h | 4 ++--
linux-user/s390x/target_structs.h | 4 ++--
linux-user/sh4/target_structs.h | 4 ++--
linux-user/sparc/target_structs.h | 4 ++--
linux-user/sparc64/target_structs.h | 4 ++--
linux-user/tilegx/target_structs.h | 4 ++--
linux-user/unicore32/target_structs.h | 4 ++--
linux-user/x86_64/target_structs.h | 4 ++--
17 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/linux-user/aarch64/target_structs.h
b/linux-user/aarch64/target_structs.h
index 21c1f2c..a4998a7 100644
--- a/linux-user/aarch64/target_structs.h
+++ b/linux-user/aarch64/target_structs.h
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TARGET_STRUCTS_H
-#define TARGET_STRUCTS_H
+#ifndef AARCH64_TARGET_STRUCTS_H
+#define AARCH64_TARGET_STRUCTS_H
struct target_ipc_perm {
abi_int __key; /* Key. */
diff --git a/linux-user/alpha/target_structs.h
b/linux-user/alpha/target_structs.h
index 50e7708..db2bfe2 100644
--- a/linux-user/alpha/target_structs.h
+++ b/linux-user/alpha/target_structs.h
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TARGET_STRUCTS_H
-#define TARGET_STRUCTS_H
+#ifndef ALPHA_TARGET_STRUCTS_H
+#define ALPHA_TARGET_STRUCTS_H
struct target_ipc_perm {
abi_int __key; /* Key. */
diff --git a/linux-user/arm/target_structs.h b/linux-user/arm/target_structs.h
index f3c85d4..0bf034c 100644
--- a/linux-user/arm/target_structs.h
+++ b/linux-user/arm/target_structs.h
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TARGET_STRUCTS_H
-#define TARGET_STRUCTS_H
+#ifndef ARM_TARGET_STRUCTS_H
+#define ARM_TARGET_STRUCTS_H
struct target_ipc_perm {
abi_int __key; /* Key. */
diff --git a/linux-user/cris/target_structs.h b/linux-user/cris/target_structs.h
index e4a1ffb..76f9653 100644
--- a/linux-user/cris/target_structs.h
+++ b/linux-user/cris/target_structs.h
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TARGET_STRUCTS_H
-#define TARGET_STRUCTS_H
+#ifndef CRIS_TARGET_STRUCTS_H
+#define CRIS_TARGET_STRUCTS_H
struct target_ipc_perm {
abi_int __key; /* Key. */
diff --git a/linux-user/i386/target_structs.h b/linux-user/i386/target_structs.h
index 65f535e..25388a7 100644
--- a/linux-user/i386/target_structs.h
+++ b/linux-user/i386/target_structs.h
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TARGET_STRUCTS_H
-#define TARGET_STRUCTS_H
+#ifndef I386_TARGET_STRUCTS_H
+#define I386_TARGET_STRUCTS_H
struct target_ipc_perm {
abi_int __key; /* Key. */
diff --git a/linux-user/m68k/target_structs.h b/linux-user/m68k/target_structs.h
index de257c9..a003676 100644
--- a/linux-user/m68k/target_structs.h
+++ b/linux-user/m68k/target_structs.h
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TARGET_STRUCTS_H
-#define TARGET_STRUCTS_H
+#ifndef M68K_TARGET_STRUCTS_H
+#define M68K_TARGET_STRUCTS_H
struct target_ipc_perm {
abi_int __key; /* Key. */
diff --git a/linux-user/microblaze/target_structs.h
b/linux-user/microblaze/target_structs.h
index 325e2f6..70dbdb6 100644
--- a/linux-user/microblaze/target_structs.h
+++ b/linux-user/microblaze/target_structs.h
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TARGET_STRUCTS_H
-#define TARGET_STRUCTS_H
+#ifndef MICROBLAZE_TARGET_STRUCTS_H
+#define MICROBLAZE_TARGET_STRUCTS_H
struct target_ipc_perm {
abi_int __key; /* Key. */
diff --git a/linux-user/mips/target_structs.h b/linux-user/mips/target_structs.h
index 16021e8..fbd9955 100644
--- a/linux-user/mips/target_structs.h
+++ b/linux-user/mips/target_structs.h
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TARGET_STRUCTS_H
-#define TARGET_STRUCTS_H
+#ifndef MIPS_TARGET_STRUCTS_H
+#define MIPS_TARGET_STRUCTS_H
struct target_ipc_perm {
abi_int __key; /* Key. */
diff --git a/linux-user/openrisc/target_structs.h
b/linux-user/openrisc/target_structs.h
index f4d560f..afbb7ad 100644
--- a/linux-user/openrisc/target_structs.h
+++ b/linux-user/openrisc/target_structs.h
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TARGET_STRUCTS_H
-#define TARGET_STRUCTS_H
+#ifndef OPENRISC_TARGET_STRUCTS_H
+#define OPENRISC_TARGET_STRUCTS_H
struct target_ipc_perm {
abi_int __key; /* Key. */
diff --git a/linux-user/ppc/target_structs.h b/linux-user/ppc/target_structs.h
index 2b87613..6b1f579 100644
--- a/linux-user/ppc/target_structs.h
+++ b/linux-user/ppc/target_structs.h
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TARGET_STRUCTS_H
-#define TARGET_STRUCTS_H
+#ifndef PPC_TARGET_STRUCTS_H
+#define PPC_TARGET_STRUCTS_H
struct target_ipc_perm {
abi_int __key; /* Key. */
diff --git a/linux-user/s390x/target_structs.h
b/linux-user/s390x/target_structs.h
index 6b6f5b5..cadff6d 100644
--- a/linux-user/s390x/target_structs.h
+++ b/linux-user/s390x/target_structs.h
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TARGET_STRUCTS_H
-#define TARGET_STRUCTS_H
+#ifndef S390X_TARGET_STRUCTS_H
+#define S390X_TARGET_STRUCTS_H
struct target_ipc_perm {
diff --git a/linux-user/sh4/target_structs.h b/linux-user/sh4/target_structs.h
index 32b235e..3e832bf 100644
--- a/linux-user/sh4/target_structs.h
+++ b/linux-user/sh4/target_structs.h
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TARGET_STRUCTS_H
-#define TARGET_STRUCTS_H
+#ifndef SH4_TARGET_STRUCTS_H
+#define SH4_TARGET_STRUCTS_H
struct target_ipc_perm {
abi_int __key; /* Key. */
diff --git a/linux-user/sparc/target_structs.h
b/linux-user/sparc/target_structs.h
index c139e09..ee24c3b 100644
--- a/linux-user/sparc/target_structs.h
+++ b/linux-user/sparc/target_structs.h
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TARGET_STRUCTS_H
-#define TARGET_STRUCTS_H
+#ifndef SPARC_TARGET_STRUCTS_H
+#define SPARC_TARGET_STRUCTS_H
struct target_ipc_perm {
abi_int __key; /* Key. */
diff --git a/linux-user/sparc64/target_structs.h
b/linux-user/sparc64/target_structs.h
index fc17290..1808132 100644
--- a/linux-user/sparc64/target_structs.h
+++ b/linux-user/sparc64/target_structs.h
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TARGET_STRUCTS_H
-#define TARGET_STRUCTS_H
+#ifndef SPARC64_TARGET_STRUCTS_H
+#define SPARC64_TARGET_STRUCTS_H
struct target_ipc_perm {
abi_int __key; /* Key. */
diff --git a/linux-user/tilegx/target_structs.h
b/linux-user/tilegx/target_structs.h
index 7d3ff78..de8b1f2 100644
--- a/linux-user/tilegx/target_structs.h
+++ b/linux-user/tilegx/target_structs.h
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TARGET_STRUCTS_H
-#define TARGET_STRUCTS_H
+#ifndef TILEGX_TARGET_STRUCTS_H
+#define TILEGX_TARGET_STRUCTS_H
struct target_ipc_perm {
abi_int __key; /* Key. */
diff --git a/linux-user/unicore32/target_structs.h
b/linux-user/unicore32/target_structs.h
index 7893695..fbd4fa3 100644
--- a/linux-user/unicore32/target_structs.h
+++ b/linux-user/unicore32/target_structs.h
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TARGET_STRUCTS_H
-#define TARGET_STRUCTS_H
+#ifndef UNICORE32_TARGET_STRUCTS_H
+#define UNICORE32_TARGET_STRUCTS_H
struct target_ipc_perm {
abi_int __key; /* Key. */
diff --git a/linux-user/x86_64/target_structs.h
b/linux-user/x86_64/target_structs.h
index d934056..3489827 100644
--- a/linux-user/x86_64/target_structs.h
+++ b/linux-user/x86_64/target_structs.h
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TARGET_STRUCTS_H
-#define TARGET_STRUCTS_H
+#ifndef X86_64_TARGET_STRUCTS_H
+#define X86_64_TARGET_STRUCTS_H
struct target_ipc_perm {
abi_int __key; /* Key. */
--
2.5.5
- [Qemu-devel] [PATCH 02/18] scripts: New clean-header-guards.pl, (continued)
- [Qemu-devel] [PATCH 02/18] scripts: New clean-header-guards.pl, Markus Armbruster, 2016/06/29
- [Qemu-devel] [PATCH 03/18] target-*: Clean up cpu.h header guards, Markus Armbruster, 2016/06/29
- [Qemu-devel] [PATCH 09/18] linux-user: Fix broken header guard in syscall_defs.h, Markus Armbruster, 2016/06/29
- [Qemu-devel] [PATCH 12/18] Drop Emacs local variables lists redundant with .dir-locals.el, Markus Armbruster, 2016/06/29
- [Qemu-devel] [PATCH 08/18] linux-user: Clean up hostdep.h header guards, Markus Armbruster, 2016/06/29
- [Qemu-devel] [PATCH 18/18] cris: Fix broken header guard in hw/cris/boot.h, Markus Armbruster, 2016/06/29
- [Qemu-devel] [PATCH 06/18] linux-user: Clean up target_signal.h header guards, Markus Armbruster, 2016/06/29
- [Qemu-devel] [PATCH 04/18] linux-user: Clean up target_syscall.h header guards, Markus Armbruster, 2016/06/29
- [Qemu-devel] [PATCH 14/18] libdecnumber: Don't fool around with guards to avoid #include, Markus Armbruster, 2016/06/29
- [Qemu-devel] [PATCH 05/18] linux-user: Clean up target_cpu.h header guards, Markus Armbruster, 2016/06/29
- [Qemu-devel] [PATCH 07/18] linux-user: Clean up target_structs.h header guards,
Markus Armbruster <=
- [Qemu-devel] [PATCH 10/18] tcg: Clean up tcg-target.h header guards, Markus Armbruster, 2016/06/29
- [Qemu-devel] [PATCH 11/18] spapr_pci: Include spapr.h instead of playing games with #error, Markus Armbruster, 2016/06/29
- [Qemu-devel] [PATCH 15/18] libdecnumber: Don't error out on decNumberLocal.h re-inclusion, Markus Armbruster, 2016/06/29
- [Qemu-devel] [PATCH 01/18] Use #include "..." for our own headers, <...> for others, Markus Armbruster, 2016/06/29
- [Qemu-devel] [PATCH 17/18] Clean up decorations and whitespace around header guards, Markus Armbruster, 2016/06/29
- [Qemu-devel] [PATCH 13/18] Clean up header guards that don't match their file name, Markus Armbruster, 2016/06/29
- [Qemu-devel] [PATCH 16/18] Clean up ill-advised or unusual header guards, Markus Armbruster, 2016/06/29