X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-menu.h;h=3b7bc88e8992d3a358355bf9a502c12fb9e723ec;hp=4fca99f94f1ccc4a60b5011e7bbd437c191a844f;hb=bf8d7e61a8fbc19be5ea1a73b9eaa30e58453d1f;hpb=4341aeae5ace4f8137334d6e8fa885d546fd3216

diff --git a/ui/ncurses/nc-menu.h b/ui/ncurses/nc-menu.h
index 4fca99f..3b7bc88 100644
--- a/ui/ncurses/nc-menu.h
+++ b/ui/ncurses/nc-menu.h
@@ -19,11 +19,19 @@
 #if !defined(_PB_NC_MENU_H)
 #define _PB_NC_MENU_H
 
-#include <assert.h>
-#include <menu.h>
+#include <linux/input.h> /* This must be included before ncurses.h */
+#if defined HAVE_NCURSESW_MENU_H
+#  include <ncursesw/menu.h>
+#elif defined HAVE_NCURSES_MENU_H
+#  include <ncurses/menu.h>
+#elif defined HAVE_MENU_H
+#  include <menu.h>
+#else
+#  error "Curses menu.h not found."
+#endif
 
 #include "log/log.h"
-#include "pb-protocol/pb-protocol.h"
+#include "types/types.h"
 #include "nc-scr.h"
 
 struct pmenu;
@@ -39,7 +47,7 @@ struct pmenu_item {
 	ITEM *nci;
 	struct pmenu *pmenu;
 	void *data;
-	int (*on_edit)(struct pmenu_item *item);
+	void (*on_edit)(struct pmenu_item *item);
 	int (*on_execute)(struct pmenu_item *item);
 };
 
@@ -77,7 +85,7 @@ struct pmenu {
 	unsigned int insert_pt;
 	int (*hot_key)(struct pmenu *menu, struct pmenu_item *item, int c);
 	void (*on_exit)(struct pmenu *menu);
-	void (*on_open)(struct pmenu *menu);
+	void (*on_new)(struct pmenu *menu);
 };
 
 struct pmenu *pmenu_init(void *ui_ctx, unsigned int item_count,