[syslinux:wip.makefixes] Revert "Update the longjump calls to fit the new declaration"

[syslinux-bot for H. Peter Anvin (Intel)]

Commit-ID:  177f4776149974560a2bc12bd16c52f404949b5c
Gitweb:     https://www.syslinux.org/commit/177f4776149974560a2bc12bd16c52f404949b5c
Author:     H. Peter Anvin (Intel) <hpa at zytor.com>
AuthorDate: Sat, 23 Mar 2019 16:40:07 -0700
Committer:  H. Peter Anvin (Intel) <hpa at zytor.com>
CommitDate: Sat, 23 Mar 2019 16:40:07 -0700

Revert "Update the longjump calls to fit the new declaration"

This reverts commit 22d32c15ea96c01c8c05b8c1551095716d42f3a4.

This workaround for the incorrect setjmp() definition in gnu-efi is no
longer necessary.

Signed-off-by: H. Peter Anvin (Intel) <hpa at zytor.com>

---
 core/efi/main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/efi/main.c b/core/efi/main.c
index 8b50a407..27923d38 100644
--- a/core/efi/main.c
+++ b/core/efi/main.c
@@ -10,6 +10,7 @@
 #include <syslinux/firmware.h>
 #include <syslinux/linux.h>
 #include <sys/ansi.h>
+#include <setjmp.h>
 
 #include "efi.h"
 #include "fio.h"
@@ -185,7 +186,7 @@ __export void local_boot(uint16_t ax)
      * Inform the firmware that we failed to execute correctly, which
      * will trigger the next entry in the EFI Boot Manager list.
      */
-    longjmp(&load_error_buf, 1);
+    longjmp(load_error_buf, 1);
 }
 
 void bios_timer_cleanup(void)
@@ -1377,7 +1378,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *table)
 		status = uefi_call_wrapper(in->ReadKeyStroke, 2, in, &key);
 	} while (status == EFI_SUCCESS);
 
-	if (!setjmp(&load_error_buf))
+	if (!setjmp(load_error_buf))
 		load_env32(NULL);
 
 	/* load_env32() failed.. cancel timer and bailout */