From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52576) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSqI8-000181-5m for qemu-devel@nongnu.org; Tue, 03 Mar 2015 12:07:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YSqI3-00073b-NP for qemu-devel@nongnu.org; Tue, 03 Mar 2015 12:07:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51297) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSqI3-00073P-GW for qemu-devel@nongnu.org; Tue, 03 Mar 2015 12:07:27 -0500 Date: Tue, 3 Mar 2015 18:07:19 +0100 From: "Michael S. Tsirkin" Message-ID: <1425402197-21726-2-git-send-email-mst@redhat.com> References: <1425402197-21726-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1425402197-21726-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v4 1/2] aml-build: fix build for glib < 2.22 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Anthony Liguori g_ptr_array_new_with_free_func is there since glib 2.22, use the older g_ptr_array_foreach instead. Reported-by: Peter Maydell Signed-off-by: Michael S. Tsirkin --- hw/acpi/aml-build.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 3e5949b..876cada 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -299,7 +299,7 @@ static Aml *aml_bundle(uint8_t op, AmlBlockFlags flags) return var; } -static void aml_free(gpointer data) +static void aml_free(gpointer data, gpointer user_data) { Aml *var = data; build_free_array(var->buf); @@ -310,13 +310,14 @@ Aml *init_aml_allocator(void) Aml *var; assert(!alloc_list); - alloc_list = g_ptr_array_new_with_free_func(aml_free); + alloc_list = g_ptr_array_new(); var = aml_alloc(); return var; } void free_aml_allocator(void) { + g_ptr_array_foreach(alloc_list, aml_free, NULL); g_ptr_array_free(alloc_list, true); alloc_list = 0; } -- MST