From patchwork Mon Aug 11 09:34:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 378927 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id C849214008F; Mon, 11 Aug 2014 19:34:33 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XGlzq-00072j-Lc; Mon, 11 Aug 2014 09:34:30 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XGlzl-00072a-6s for fwts-devel@lists.ubuntu.com; Mon, 11 Aug 2014 09:34:25 +0000 Received: from host125-226-dynamic.59-82-r.retail.telecomitalia.it ([82.59.226.125] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1XGlzk-0004be-UP for fwts-devel@lists.ubuntu.com; Mon, 11 Aug 2014 09:34:25 +0000 From: Alberto Milone To: fwts-devel@lists.ubuntu.com Subject: [PATCH] s3power.c, s4.c: add backward compatibility with older glib releases Date: Mon, 11 Aug 2014 11:34:20 +0200 Message-Id: <1407749660-17909-1-git-send-email-alberto.milone@canonical.com> X-Mailer: git-send-email 1.9.1 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: fwts-devel-bounces@lists.ubuntu.com Signed-off-by: Alberto Milone Acked-by: Keng-Yu Lin Acked-by: Alex Hung --- src/acpi/s3power/s3power.c | 5 +++++ src/acpi/s4/s4.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/acpi/s3power/s3power.c b/src/acpi/s3power/s3power.c index 275539c..c391fd9 100644 --- a/src/acpi/s3power/s3power.c +++ b/src/acpi/s3power/s3power.c @@ -247,6 +247,11 @@ static int s3power_test(fwts_framework *fw) int (*do_suspend)(fwts_pm_method_vars *, const int, int*, const char*); +#if !GLIB_CHECK_VERSION(2,35,0) + /* This is for backward compatibility with old glib versions */ + g_type_init(); +#endif + fwts_settings = calloc(1, sizeof(fwts_pm_method_vars)); if (fwts_settings == NULL) return FWTS_OUT_OF_MEMORY; diff --git a/src/acpi/s4/s4.c b/src/acpi/s4/s4.c index 8400538..2ea76bb 100644 --- a/src/acpi/s4/s4.c +++ b/src/acpi/s4/s4.c @@ -348,6 +348,11 @@ static int s4_test_multiple(fwts_framework *fw) bool retried = false; char tmp[32]; +#if !GLIB_CHECK_VERSION(2,35,0) + /* This is for backward compatibility with old glib versions */ + g_type_init(); +#endif + if (s4_multiple == 1) fwts_log_info(fw, "Defaulted to run 1 test, run --s4-multiple=N to run more S4 cycles\n");