[oe-commits] [meta-openembedded] 05/20: kexecboot: sync fix for gcc5 with upstream

[git at git.openembedded.org]

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit faeb37bf30972d07f9eb35e9ade806a571ca454b
Author: Andrea Adami <andrea.adami at gmail.com>
AuthorDate: Sun Feb 28 23:54:22 2016 +0100

    kexecboot: sync fix for gcc5 with upstream
    
    Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 .../kexecboot/files/0005-rgb.h-fix-build-with-gcc5.patch           | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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 e451435..b54199b 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
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.