Syslinux - Jun 2017 - [PATCH 1/3] The VPrint definition is now part of the exports of gnu-efi

Signed-off-by: Beno?t Allard <benoit.allard at greenbone.net>
---
 efi/fio.h | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/efi/fio.h b/efi/fio.h
index 65fff8d..a1bfe68 100644
--- a/efi/fio.h
+++ b/efi/fio.h
@@ -11,15 +11,6 @@
 #define MAX_EFI_ARGS		64
 #define WS(c16)         (c16 == L' ' || c16 == CHAR_TAB)
 
-/* VPrint is not in export declarations in gnu-efi lib yet
- * although it is a global function; declare it here
- */
-extern UINTN
-VPrint (
-    IN CHAR16   *fmt,
-    va_list     args
-    );
-
 extern EFI_STATUS efi_errno;
 
 void efi_memcpy(unsigned char *dst, unsigned char *src, size_t len);
-- 
2.1.4

Signed-off-by: Beno?t Allard <benoit.allard at greenbone.net>
---
 efi/pxe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/efi/pxe.c b/efi/pxe.c
index 6e59109..8060dff 100644
--- a/efi/pxe.c
+++ b/efi/pxe.c
@@ -90,7 +90,7 @@ struct embedded_dhcp_options embedded_dhcp_options  void
net_parse_dhcp(void)
 {
     EFI_PXE_BASE_CODE_MODE *mode;
-    EFI_PXE_BASE_CODE *bc;
+    EFI_PXE_BASE_CODE_PROTOCOL *bc;
     unsigned int pkt_len = sizeof(EFI_PXE_BASE_CODE_PACKET);
     EFI_STATUS status;
     uint8_t hardlen;
-- 
2.1.4

Signed-off-by: Beno?t Allard <benoit.allard at greenbone.net>
---
 efi/main.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/efi/main.c b/efi/main.c
index fd95f5c..b5383cd 100644
--- a/efi/main.c
+++ b/efi/main.c
@@ -10,7 +10,6 @@
 #include <syslinux/firmware.h>
 #include <syslinux/linux.h>
 #include <sys/ansi.h>
-#include <setjmp.h>
 
 #include "efi.h"
 #include "fio.h"
@@ -31,7 +30,7 @@ uint32_t timer_irq;
 __export uint8_t KbdMap[256];
 char aux_seg[256];
 
-static jmp_buf load_error_buf;
+static jmp_buf *load_error_buf;
 
 EFI_HANDLE image_handle, image_device_handle, mnpsb_handle;
 
-- 
2.1.4