diff options
| author | Peter Jones <pjones@redhat.com> | 2014-08-27 13:26:23 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2014-08-27 16:40:57 -0400 |
| commit | 32f10548cdf1919103654ab65601c8b15c3976a1 (patch) | |
| tree | 688d531a21c586069f995982c55d483d487aa31d | |
| parent | 94c9a77f6504170a6bd38b0aa29039208987650e (diff) | |
| download | efi-boot-shim-32f10548cdf1919103654ab65601c8b15c3976a1.tar.gz efi-boot-shim-32f10548cdf1919103654ab65601c8b15c3976a1.zip | |
Don't name something exit().
On aarch64 due to some terrifying include chain we wind up with
Cryptlib's definition of exit here. I'm not a glutton for punishment,
so I'm just changing the name so it's not coliding.
Signed-off-by: Peter Jones <pjones@redhat.com>
| -rw-r--r-- | replacements.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/replacements.c b/replacements.c index 5dfa3556..f7623d9d 100644 --- a/replacements.c +++ b/replacements.c @@ -162,7 +162,7 @@ exit_boot_services(EFI_HANDLE image_key, UINTN map_key) } static EFI_STATUS EFIAPI -exit(EFI_HANDLE ImageHandle, EFI_STATUS ExitStatus, +do_exit(EFI_HANDLE ImageHandle, EFI_STATUS ExitStatus, UINTN ExitDataSize, CHAR16 *ExitData) { EFI_STATUS status; @@ -206,5 +206,5 @@ hook_system_services(EFI_SYSTEM_TABLE *local_systab) * bootloader and still e.g. start a new one or run an internal * shell. */ system_exit = systab->BootServices->Exit; - systab->BootServices->Exit = exit; + systab->BootServices->Exit = do_exit; } |