various fixes and simplifications wrt openssl.h

[apps/madmutt.git] / keymap.h

diff --git a/keymap.h b/keymap.h
index 4ec7dd3..0a0d428 100644 (file)
--- a/keymap.h
+++ b/keymap.h
@@ -10,7 +10,7 @@
 #ifndef KEYMAP_H
 #define KEYMAP_H
 
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
 
 /* maximal length of a key binding sequence used for buffer in km_bindkey */
 #define MAX_SEQ 8
@@ -54,22 +54,11 @@ enum {
   MENU_PAGER,
   MENU_POST,
   MENU_QUERY,
-
-
   MENU_PGP,
   MENU_SMIME,
-
-#ifdef CRYPT_BACKEND_GPGME
   MENU_KEY_SELECT_PGP,
   MENU_KEY_SELECT_SMIME,
-#endif
-
-#ifdef MIXMASTER
   MENU_MIX,
-#endif
-
-
-
   MENU_MAX
 };
 
@@ -92,6 +81,5 @@ struct binding_t *km_get_table (int menu);
 #define MUTT_FUNCTIONS_PROTO
 #include "functions.def"
 
-#include "keymap_defs.h"
-
 #endif /* KEYMAP_H */
+#include "keymap_defs.h"