MIXMASTER is always defined

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/functions.def b/functions.def
index 7a32260..c7d9278 100644 (file)
--- a/functions.def
+++ b/functions.def
@@ -370,9 +370,7 @@ LIST(OpCompose)
     ITEM("pipe-entry",               OP_PIPE,                        "|")
     ITEM("pgp-menu",                 OP_COMPOSE_PGP_MENU,            "p")
     ITEM("smime-menu",               OP_COMPOSE_SMIME_MENU,          "S")
     ITEM("pipe-entry",               OP_PIPE,                        "|")
     ITEM("pgp-menu",                 OP_COMPOSE_PGP_MENU,            "p")
     ITEM("smime-menu",               OP_COMPOSE_SMIME_MENU,          "S")

-#ifdef MIXMASTER

     ITEM("mix",                      OP_COMPOSE_MIX,                 "M")
     ITEM("mix",                      OP_COMPOSE_MIX,                 "M")

-#endif

 ENDLIST
 
 LIST(OpPost)
 ENDLIST
 
 LIST(OpPost)


@@ -459,7 +457,6 @@ LIST(OpSmime)
 #endif
 ENDLIST
 
 #endif
 ENDLIST
 

-#ifdef MIXMASTER

 LIST(OpMix)
     ITEM("accept",                   OP_MIX_USE,                     M_ENTER_S)
     ITEM("append",                   OP_MIX_APPEND,                  "a")
 LIST(OpMix)
     ITEM("accept",                   OP_MIX_USE,                     M_ENTER_S)
     ITEM("append",                   OP_MIX_APPEND,                  "a")


@@ -468,7 +465,6 @@ LIST(OpMix)
     ITEM("chain-prev",               OP_MIX_CHAIN_PREV,              "<left>")
     ITEM("chain-next",               OP_MIX_CHAIN_NEXT,              "<right>")
 ENDLIST
     ITEM("chain-prev",               OP_MIX_CHAIN_PREV,              "<left>")
     ITEM("chain-next",               OP_MIX_CHAIN_NEXT,              "<right>")
 ENDLIST

-#endif /* MIXMASTER */

 
 #undef ENDLIST
 #undef ITEM
 
 #undef ENDLIST
 #undef ITEM