diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-10-07 11:03:14 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-10-07 11:03:14 +0100 |
| commit | 957235cf19a691360c720f7913672adda4258ed0 (patch) | |
| tree | 812bba7928f4293ead05a7ee9c1ac39c5ef9f12e /sys-boot/elilo/files | |
| parent | 62f67115b5c46134c34f88f4b1cbdacc19384c0a (diff) | |
gentoo resync : 07.10.2018
Diffstat (limited to 'sys-boot/elilo/files')
| -rw-r--r-- | sys-boot/elilo/files/elilo-3.16-strncpy-clash.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/sys-boot/elilo/files/elilo-3.16-strncpy-clash.patch b/sys-boot/elilo/files/elilo-3.16-strncpy-clash.patch new file mode 100644 index 000000000000..fb2f6878be03 --- /dev/null +++ b/sys-boot/elilo/files/elilo-3.16-strncpy-clash.patch @@ -0,0 +1,23 @@ +gnu-efi-3.0.8 added StrnCpy. This caused conflict with elilo's definition: + ./../fs/../strops.h:30:16: error: conflicting types for 'StrnCpy' + extern CHAR16 *StrnCpy(OUT CHAR16 *dst, IN const CHAR16 *src, UINTN count); + ^~~~~~~ + +Work it around by always using private copy. + +Reported-by: Bill Glessner +--- a/strops.h ++++ b/strops.h +@@ -29,3 +29,4 @@ + extern CHAR16 *StrChr(IN const CHAR16 *s, const CHAR16 c); ++#define StrnCpy elilo_StrnCpy + extern CHAR16 *StrnCpy(OUT CHAR16 *dst, IN const CHAR16 *src, UINTN count); + extern CHAR8 *StrnXCpy(OUT CHAR8 *dst, IN const CHAR16 *src, UINTN count); +--- a/strops.c ++++ b/strops.c +@@ -27,4 +27,6 @@ + #include <efilib.h> + ++#include "strops.h" ++ + //#define CHAR_NULL (CHAR16)'\0' |