aboutsummaryrefslogtreecommitdiff
path: root/include/hw/acpi
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2016-06-29 10:12:57 +0200
committerMarkus Armbruster <armbru@redhat.com>2016-07-12 16:19:16 +0200
commit121d07125bb6d7079c7ebafdd3efe8c3a01cc440 (patch)
treef6201b5906fcb3bfd73aeb1ce74e104249b41c27 /include/hw/acpi
parent85aad98a0e0a93c146fd4c306114f23824a3db5f (diff)
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. Offenders found with scripts/clean-header-guards.pl -vn. 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> Reviewed-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'include/hw/acpi')
-rw-r--r--include/hw/acpi/aml-build.h4
-rw-r--r--include/hw/acpi/cpu_hotplug.h5
2 files changed, 5 insertions, 4 deletions
diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
index e7a1a4cefd..e5f087803f 100644
--- a/include/hw/acpi/aml-build.h
+++ b/include/hw/acpi/aml-build.h
@@ -1,5 +1,5 @@
-#ifndef HW_ACPI_GEN_UTILS_H
-#define HW_ACPI_GEN_UTILS_H
+#ifndef HW_ACPI_AML_BUILD_H
+#define HW_ACPI_AML_BUILD_H
#include "hw/acpi/acpi-defs.h"
#include "hw/acpi/bios-linker-loader.h"
diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h
index b995ef2ebd..3b932abbbb 100644
--- a/include/hw/acpi/cpu_hotplug.h
+++ b/include/hw/acpi/cpu_hotplug.h
@@ -9,8 +9,9 @@
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
-#ifndef ACPI_HOTPLUG_H
-#define ACPI_HOTPLUG_H
+
+#ifndef HW_ACPI_CPU_HOTPLUG_H
+#define HW_ACPI_CPU_HOTPLUG_H
#include "hw/acpi/acpi.h"
#include "hw/acpi/pc-hotplug.h"