X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_menu.h;h=41204a6a55f8488c18e759e2cd0423ea9382be81;hp=e6cb6137467516b30ea7374618099ac049bb6708;hb=93b012884de4ca5e1f2550f767d0b8680b9c0e9f;hpb=c3e57678c8be193fc137854020f3a90887be97c9

diff --git a/mutt_menu.h b/mutt_menu.h
index e6cb613..41204a6 100644
--- a/mutt_menu.h
+++ b/mutt_menu.h
@@ -6,13 +6,15 @@
  * It's licensed under the GNU General Public License,
  * please see the file GPL in the top level source directory.
  */
-
+#ifndef _MUTT_MENU_H
+#define _MUTT_MENU_H
 /*
  * This file is named mutt_menu.h so it doesn't collide with ncurses menu.h
  */
 
 #include "keymap.h"
-#include "mutt_regex.h"
+
+#include "lib/rx.h"
 
 #define REDRAW_INDEX		(1)
 #define REDRAW_MOTION		(1<<1)
@@ -48,7 +50,7 @@ typedef struct menu_t {
   char *keys;                   /* keys used in the prompt */
 
   /* callback to generate an index line for the requested element */
-  void (*make_entry) (char *, size_t, struct menu_t *, int);
+  void (*make_entry) (char *, ssize_t, struct menu_t *, int);
 
   /* how to search the menu */
   int (*search) (struct menu_t *, regex_t * re, int n);
@@ -99,3 +101,5 @@ int mutt_menuLoop (MUTTMENU *);
 /* used in both the index and pager index to make an entry. */
 void index_make_entry (char *, size_t, struct menu_t *, int);
 int index_color (int);
+
+#endif /* !_MUTT_MENU_H */