From 3f6f7f7420d37dd080d5d04d7c1c539142f732b6 Mon Sep 17 00:00:00 2001 From: Fredrik Holmqvist Date: Sun, 31 Jan 2021 16:13:20 +0100 Subject: [PATCH] ACPICA fixes for gcc2.95.3 pswalk has issues in code we don't use for gcc 2.95.3, so just disable Can we drop gcc2.95.3 soon? Change-Id: I334b5029f97ad66b46bd0054c05c75062fec27fc Reviewed-on: https://review.haiku-os.org/c/haiku/+/3723 Reviewed-by: Fredrik Holmqvist --- .../bus_managers/acpi/acpica/components/parser/pswalk.c | 4 ++-- src/add-ons/kernel/bus_managers/acpi/acpica/include/actypes.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/pswalk.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/pswalk.c index 0d5b78ddb2..de1167ac27 100644 --- a/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/pswalk.c +++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/pswalk.c @@ -193,7 +193,7 @@ AcpiPsDeleteParseTree ( if (Op != Parent) { /* This is the descending case */ - +#if 0 //gcc2.95.3 warns about printf format in code we do not use if (ACPI_IS_DEBUG_ENABLED (ACPI_LV_PARSE_TREES, _COMPONENT)) { /* This debug option will print the entire parse tree */ @@ -211,7 +211,7 @@ AcpiPsDeleteParseTree ( } AcpiOsPrintf ("\n"); } - +#endif /* Look for an argument or child of the current op */ Next = AcpiPsGetArg (Op, 0); diff --git a/src/add-ons/kernel/bus_managers/acpi/acpica/include/actypes.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/actypes.h index e98e636a36..e6d2e4b2f3 100644 --- a/src/add-ons/kernel/bus_managers/acpi/acpica/include/actypes.h +++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/actypes.h @@ -1379,7 +1379,7 @@ typedef struct acpi_pnp_device_id_list { UINT32 Count; /* Number of IDs in Ids array */ UINT32 ListSize; /* Size of list, including ID strings */ - ACPI_PNP_DEVICE_ID Ids[]; /* ID array */ + ACPI_PNP_DEVICE_ID Ids[1]; /* ID array */ } ACPI_PNP_DEVICE_ID_LIST;