From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxfYh-0002aw-B3 for qemu-devel@nongnu.org; Wed, 27 May 2015 13:56:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxfYc-0002PT-VM for qemu-devel@nongnu.org; Wed, 27 May 2015 13:56:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53846) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxfYc-0002P6-GT for qemu-devel@nongnu.org; Wed, 27 May 2015 13:55:58 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t4RHtv4B009378 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 27 May 2015 13:55:57 -0400 From: Markus Armbruster Date: Wed, 27 May 2015 19:55:54 +0200 Message-Id: <1432749355-4960-3-git-send-email-armbru@redhat.com> In-Reply-To: <1432749355-4960-1-git-send-email-armbru@redhat.com> References: <1432749355-4960-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 2/3] acpi: Drop superfluous GLIB_CHECK_VERSION() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com 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 --- hw/acpi/aml-build.c | 2 -- 1 file changed, 2 deletions(-) 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; } -- 1.9.3