diff mbox

[2/3] acpi: Drop superfluous GLIB_CHECK_VERSION()

Message ID 1432749355-4960-3-git-send-email-armbru@redhat.com
State New
Headers show

Commit Message

Markus Armbruster May 27, 2015, 5:55 p.m. UTC 
The version check is always true since we require GLib 2.22+ (commit
f40685c).  It dates back to commit 8b9c3b8 "acpi-build: fix build on
glib < 2.22", amended in commit fd8f5e3 "acpi-build: fix build on glib
< 2.14".  I guess we could revert both of them now, but I'm not sure
it's worth the churn, so just drop the superfluous check instead.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/acpi/aml-build.c | 2 --
 1 file changed, 2 deletions(-)
diff mbox

Patch

diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index 65c9d00..9efbb37 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -922,9 +922,7 @@  void *acpi_data_push(GArray *table_data, unsigned size)
 
 unsigned acpi_data_len(GArray *table)
 {
-#if GLIB_CHECK_VERSION(2, 22, 0)
     assert(g_array_get_element_size(table) == 1);
-#endif
     return table->len;
 }