From 32f10548cdf1919103654ab65601c8b15c3976a1 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 27 Aug 2014 13:26:23 -0400
Subject: [PATCH 53/74] 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>
---
replacements.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/replacements.c b/replacements.c
index 5dfa355..f7623d9 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;
}
--
1.9.3