From e0171b34bd90430c1cdcc25273e1ad487c0d91c0 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 28 Feb 2016 23:54:22 +0100 Subject: kexecboot: sync fix for gcc5 with upstream Signed-off-by: Andrea Adami Signed-off-by: Martin Jansa --- .../kexecboot/files/0005-rgb.h-fix-build-with-gcc5.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta-initramfs') diff --git a/meta-initramfs/recipes-bsp/kexecboot/files/0005-rgb.h-fix-build-with-gcc5.patch b/meta-initramfs/recipes-bsp/kexecboot/files/0005-rgb.h-fix-build-with-gcc5.patch index e451435dc..b54199b08 100644 --- a/meta-initramfs/recipes-bsp/kexecboot/files/0005-rgb.h-fix-build-with-gcc5.patch +++ b/meta-initramfs/recipes-bsp/kexecboot/files/0005-rgb.h-fix-build-with-gcc5.patch @@ -20,15 +20,16 @@ diff --git a/rgb.h b/rgb.h index 0ba987a..4f64622 100644 --- a/rgb.h +++ b/rgb.h -@@ -51,7 +51,7 @@ typedef struct { +@@ -51,8 +51,7 @@ typedef struct { } kx_named_color; /* Convert RGBA uint32 to red/green/blue/alpha components */ -inline void -+extern inline void - rgba2comp(kx_rgba rgba, kx_ccomp *red, kx_ccomp *green, +-rgba2comp(kx_rgba rgba, kx_ccomp *red, kx_ccomp *green, ++void rgba2comp(kx_rgba rgba, kx_ccomp *red, kx_ccomp *green, kx_ccomp *blue, kx_ccomp *alpha); + /* Convert hex rgb color to rgba color */ -- 1.9.1 -- cgit v1.2.3-54-g00ecf