From f0aed5c1cf4fe1830df1b2f2ac3a0a864137ea51 Mon Sep 17 00:00:00 2001
From: Richard Russon <rich@flatcap.org>
Date: Tue, 13 Dec 2016 01:02:23 +0000
Subject: [PATCH] build: remove unnecessary #ifdef's

Several source files contain #ifdef's around all the code.
They aren't necessary -- their inclusion is handled by the Makefile.
---
 crypt-gpgme.c | 4 ----
 hcache-bdb.c  | 3 ---
 hcache-gdbm.c | 3 ---
 hcache-kc.c   | 3 ---
 hcache-lmdb.c | 3 ---
 hcache-qdbm.c | 3 ---
 hcache-tc.c   | 3 ---
 7 files changed, 22 deletions(-)

diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index 596b71161..ca8149a43 100644
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -25,8 +25,6 @@
 # include "config.h"
 #endif
 
-#ifdef CRYPT_BACKEND_GPGME
-
 #include "mutt.h"
 #include "mutt_crypt.h"
 #include "mutt_menu.h"
@@ -4966,5 +4964,3 @@ void mutt_gpgme_set_sender (const char *sender)
   current_sender = safe_strdup (sender);
 }
 
-
-#endif
diff --git a/hcache-bdb.c b/hcache-bdb.c
index 3c2b41454..a2f36f250 100644
--- a/hcache-bdb.c
+++ b/hcache-bdb.c
@@ -21,8 +21,6 @@
 
 #include "config.h"
 
-#ifdef HAVE_BDB
-
 #include "hcache-backend.h"
 #include "mutt.h"
 #include "mx.h"
@@ -205,4 +203,3 @@ hcache_bdb_backend(void)
 
 HCACHE_BACKEND_OPS(bdb)
 
-#endif /* HAVE_BDB */
diff --git a/hcache-gdbm.c b/hcache-gdbm.c
index da27018bf..1f52a42ef 100644
--- a/hcache-gdbm.c
+++ b/hcache-gdbm.c
@@ -21,8 +21,6 @@
 
 #include "config.h"
 
-#ifdef HAVE_GDBM
-
 #include "hcache-backend.h"
 #include "mutt.h"
 #include <gdbm.h>
@@ -120,4 +118,3 @@ hcache_gdbm_backend(void)
 
 HCACHE_BACKEND_OPS(gdbm)
 
-#endif /* HAVE_GDBM */
diff --git a/hcache-kc.c b/hcache-kc.c
index 46a0968d0..65aba9635 100644
--- a/hcache-kc.c
+++ b/hcache-kc.c
@@ -21,8 +21,6 @@
 
 #include "config.h"
 
-#ifdef HAVE_KC
-
 #include "hcache-backend.h"
 #include "mutt.h"
 #include <kclangc.h>
@@ -126,4 +124,3 @@ hcache_kyotocabinet_backend(void)
 
 HCACHE_BACKEND_OPS(kyotocabinet)
 
-#endif /* HAVE_KC */
diff --git a/hcache-lmdb.c b/hcache-lmdb.c
index 4b35daa95..5af171667 100644
--- a/hcache-lmdb.c
+++ b/hcache-lmdb.c
@@ -21,8 +21,6 @@
 
 #include "config.h"
 
-#ifdef HAVE_LMDB
-
 #include "hcache-backend.h"
 #include "lib.h"
 
@@ -281,4 +279,3 @@ hcache_lmdb_backend(void)
 
 HCACHE_BACKEND_OPS(lmdb)
 
-#endif /* HAVE_LMDB */
diff --git a/hcache-qdbm.c b/hcache-qdbm.c
index 798d46156..0c62e03b4 100644
--- a/hcache-qdbm.c
+++ b/hcache-qdbm.c
@@ -21,8 +21,6 @@
 
 #include "config.h"
 
-#ifdef HAVE_QDBM
-
 #include "hcache-backend.h"
 #include "mutt.h"
 #include <depot.h>
@@ -94,4 +92,3 @@ hcache_qdbm_backend(void)
 
 HCACHE_BACKEND_OPS(qdbm)
 
-#endif /* HAVE_LMDB */
diff --git a/hcache-tc.c b/hcache-tc.c
index 2824a916b..657d88fb3 100644
--- a/hcache-tc.c
+++ b/hcache-tc.c
@@ -21,8 +21,6 @@
 
 #include "config.h"
 
-#ifdef HAVE_TC
-
 #include "hcache-backend.h"
 #include "mutt.h"
 #include <tcbdb.h>
@@ -111,4 +109,3 @@ hcache_tokyocabinet_backend(void)
 
 HCACHE_BACKEND_OPS(tokyocabinet)
 
-#endif /* HAVE_TC */
-- 
2.40.0