From a45709f6300aa0f5d1d8c39b1166f54630b29dfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Wed, 6 Dec 2023 17:21:28 +0100 Subject: [PATCH] Revert "ACPICA fixes for gcc2.95.3" This reverts commit 3f6f7f7420d37dd080d5d04d7c1c539142f732b6. Change-Id: If47a81ada6c7fe38c1e40bed4381a384ef25c050 Reviewed-on: https://review.haiku-os.org/c/haiku/+/7183 Reviewed-by: waddlesplash --- .../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 de1167ac27..0d5b78ddb2 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 e6d2e4b2f3..e98e636a36 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[1]; /* ID array */ + ACPI_PNP_DEVICE_ID Ids[]; /* ID array */ } ACPI_PNP_DEVICE_ID_LIST;