discover/grub2: Allow empty statements

[petitboot] / ui / ncurses / nc-boot-editor.h

diff --git a/ui/ncurses/nc-boot-editor.h b/ui/ncurses/nc-boot-editor.h
index 650c316b6960e90c918f7678d68d6861e759368d..a509f7598f5ef1cd03472a05e96aaee68b116b6d 100644 (file)
--- a/ui/ncurses/nc-boot-editor.h
+++ b/ui/ncurses/nc-boot-editor.h
@@ -19,9 +19,16 @@
 #if !defined(_PB_NC_KED_H)
 #define _PB_NC_KED_H
 
-#include <assert.h>
 #include <linux/input.h> /* This must be included before ncurses.h */
-#include <form.h>
+#if defined HAVE_NCURSESW_FORM_H
+#  include <ncursesw/form.h>
+#elif defined HAVE_NCURSES_FORM_H
+#  include <ncurses/form.h>
+#elif defined HAVE_FORM_H
+#  include <form.h>
+#else
+#  error "Curses form.h not found."
+#endif
 
 #include "types/types.h"
 #include "ui/common/ui-system.h"
@@ -59,13 +66,13 @@ struct boot_editor {
        enum boot_editor_attr_cursor attr_cursor;
        void (*on_exit)(struct boot_editor *boot_editor,
                        enum boot_editor_result result,
-                       struct pb_kexec_data *kd);
+                       struct pb_boot_data *bd);
 };
 
 struct boot_editor *boot_editor_init(void *ui_ctx,
-               const struct pb_kexec_data *kd,
+               const struct pb_boot_data *bd,
                void (*on_exit)(struct boot_editor *,
                                enum boot_editor_result,
-                               struct pb_kexec_data *));
+                               struct pb_boot_data *));
 
 #endif