remove unused code, simplifications, missing include

[apps/madmutt.git] / init.h

diff --git a/init.h b/init.h
index 1c93283..798c478 100644 (file)
--- a/init.h
+++ b/init.h
@@ -17,8 +17,6 @@
 # include "sort.h"
 #endif
 
-#include <lib-lib/debug.h>
-
 #include "buffy.h"
 #include "mutt.h"
 #include "version.h"
@@ -513,24 +511,6 @@ struct option_t MuttVars[] = {
    ** rest of the string are expanded in the \fIC\fP locale (that is in US
    ** English).
    */
-#ifdef DEBUG
-  {"debug_level", DT_NUM, R_NONE, UL &DebugLevel, "1" },
-  /*
-   ** .pp
-   ** Availability: debug
-   **
-   ** .pp
-   ** This variable specifies the current debug level and
-   ** may be used to increase or decrease the verbosity level
-   ** during runtime. It overrides the level given with the
-   ** \fT-d\fP command line option.
-   **
-   ** .pp
-   ** Currently, this number must be >= 0 and <= 5 and madmutt
-   ** must be started with \fT-d\fP to enable debugging at all;
-   ** enabling at runtime is not possible.
-   */
-#endif
   {"default_hook", DT_STR, R_NONE, UL &DefaultHook, "~f %s !~P | (~P ~C %s)"},
   /*
    ** .pp
@@ -1362,7 +1342,7 @@ struct option_t MuttVars[] = {
    ** cache (first hit).
    */
 #endif /* HAVE_GDBM || HAVE_DB 4 */
-#if HAVE_QDBM
+#ifdef HAVE_QDBM
   { "header_cache_compress", DT_BOOL, R_NONE, OPTHCACHECOMPRESS, "no" },
   /*
   ** .pp
@@ -1445,11 +1425,11 @@ struct option_t MuttVars[] = {
    ** directory containing the madmutt documentation.\fP
    */
 #ifdef USE_HCACHE
-#if HAVE_QDBM
+#if defined(HAVE_QDBM)
   {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "qdbm" },
-#elif HAVE_GDBM
+#elif defined(HAVE_GDBM)
   {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "gdbm" },
-#elif HAVE_DB4
+#elif defined(HAVE_DB4)
   {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "db4" },
 #else
   {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "unknown" },