aboutsummaryrefslogtreecommitdiffstats
path: root/meta-initramfs
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2016-02-28 23:54:22 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-03-04 09:06:07 +0100
commite0171b34bd90430c1cdcc25273e1ad487c0d91c0 (patch)
treebcf2f62f49aabc41483f7ccb55111e495dfb3958 /meta-initramfs
parent7183bacd5c866d433467a750e485e6c01af4aafc (diff)
downloadmeta-openembedded-contrib-e0171b34bd90430c1cdcc25273e1ad487c0d91c0.tar.gz
meta-openembedded-contrib-e0171b34bd90430c1cdcc25273e1ad487c0d91c0.tar.bz2
meta-openembedded-contrib-e0171b34bd90430c1cdcc25273e1ad487c0d91c0.zip
kexecboot: sync fix for gcc5 with upstream
Signed-off-by: Andrea Adami <andrea.adami@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-initramfs')
-rw-r--r--meta-initramfs/recipes-bsp/kexecboot/files/0005-rgb.h-fix-build-with-gcc5.patch7
1 files 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 e451435dcd..b54199b08c 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