diff options
| author | Andrea Adami <andrea.adami@gmail.com> | 2016-02-28 23:54:22 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-03-04 09:06:07 +0100 |
| commit | e0171b34bd90430c1cdcc25273e1ad487c0d91c0 (patch) | |
| tree | bcf2f62f49aabc41483f7ccb55111e495dfb3958 | |
| parent | 7183bacd5c866d433467a750e485e6c01af4aafc (diff) | |
| download | meta-openembedded-e0171b34bd90430c1cdcc25273e1ad487c0d91c0.tar.gz | |
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>
| -rw-r--r-- | meta-initramfs/recipes-bsp/kexecboot/files/0005-rgb.h-fix-build-with-gcc5.patch | 7 |
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 | |||
| 20 | index 0ba987a..4f64622 100644 | 20 | index 0ba987a..4f64622 100644 |
| 21 | --- a/rgb.h | 21 | --- a/rgb.h |
| 22 | +++ b/rgb.h | 22 | +++ b/rgb.h |
| 23 | @@ -51,7 +51,7 @@ typedef struct { | 23 | @@ -51,8 +51,7 @@ typedef struct { |
| 24 | } kx_named_color; | 24 | } kx_named_color; |
| 25 | 25 | ||
| 26 | /* Convert RGBA uint32 to red/green/blue/alpha components */ | 26 | /* Convert RGBA uint32 to red/green/blue/alpha components */ |
| 27 | -inline void | 27 | -inline void |
| 28 | +extern inline void | 28 | -rgba2comp(kx_rgba rgba, kx_ccomp *red, kx_ccomp *green, |
| 29 | rgba2comp(kx_rgba rgba, kx_ccomp *red, kx_ccomp *green, | 29 | +void rgba2comp(kx_rgba rgba, kx_ccomp *red, kx_ccomp *green, |
| 30 | kx_ccomp *blue, kx_ccomp *alpha); | 30 | kx_ccomp *blue, kx_ccomp *alpha); |
| 31 | 31 | ||
| 32 | /* Convert hex rgb color to rgba color */ | ||
| 32 | -- | 33 | -- |
| 33 | 1.9.1 | 34 | 1.9.1 |
| 34 | 35 | ||
