install.sh & related: Improved Secure Boot detection & removed error

[refind] / refind / menu.h

diff --git a/refind/menu.h b/refind/menu.h
index f9052d17d7ab331bec30ceac03a4629651f88cfb..5724c4c037b9884052aa4c8249310f8a86e6f199 100644 (file)
--- a/refind/menu.h
+++ b/refind/menu.h
@@ -45,8 +45,13 @@
 #ifndef __REFIND_MENU_H_
 #define __REFIND_MENU_H_
 
+#ifdef __MAKEWITH_GNUEFI
 #include "efi.h"
 #include "efilib.h"
+#else
+#include "../include/tiano_includes.h"
+#endif
+#include "global.h"
 
 #include "libeg.h"
 
@@ -89,10 +94,10 @@ struct _refit_menu_screen;
 
 VOID AddMenuInfoLine(IN REFIT_MENU_SCREEN *Screen, IN CHAR16 *InfoLine);
 VOID AddMenuEntry(IN REFIT_MENU_SCREEN *Screen, IN REFIT_MENU_ENTRY *Entry);
-VOID FreeMenu(IN REFIT_MENU_SCREEN *Screen);
+inline UINTN ComputeRow0PosY(VOID);
 VOID MainMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, IN UINTN Function, IN CHAR16 *ParamText);
 UINTN RunMenu(IN REFIT_MENU_SCREEN *Screen, OUT REFIT_MENU_ENTRY **ChosenEntry);
-UINTN RunMainMenu(IN REFIT_MENU_SCREEN *Screen, IN CHAR16* DefaultSelection, OUT REFIT_MENU_ENTRY **ChosenEntry);
+UINTN RunMainMenu(IN REFIT_MENU_SCREEN *Screen, IN CHAR16** DefaultSelection, OUT REFIT_MENU_ENTRY **ChosenEntry);
 
 #endif