[PATCH] s3.c: add backward compatibility with older glib releases

Alberto Milone alberto.milone at canonical.com
Mon Aug 4 10:27:50 UTC 2014


On 04/08/14 12:20, Alberto Milone wrote:
> Signed-off-by: Alberto Milone <alberto.milone at canonical.com>
> ---
>  src/acpi/s3/s3.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/src/acpi/s3/s3.c b/src/acpi/s3/s3.c
> index adcd188..c04e11e 100644
> --- a/src/acpi/s3/s3.c
> +++ b/src/acpi/s3/s3.c
> @@ -772,6 +772,11 @@ static int s3_test_multiple(fwts_framework *fw)
>  	int awake_delay = s3_min_delay * 1000;
>  	int delta = (int)(s3_delay_delta * 1000.0);
>  
> +#if !GLIB_CHECK_VERSION(2,35,0)
> +	/* This is for backward compatibility with old glib versions */
> +	g_type_init();
> +#endif
> +
>  	if (s3_multiple == 1)
>  		fwts_log_info(fw, "Defaulted to 1 test, use --s3-multiple=N to run more S3 cycles\n");
>  
> 

This is something we should include in the next minor release, so that
the old glib in Precise doesn't complain about the missing g_type_init().

-- 
Alberto Milone
Software Engineer
Hardware Enablement Team
Professional and Engineering Services



More information about the fwts-devel mailing list