drop #if HAVE_CONFIG_H

config.h is a compulsory part of the project.
The preprocessor conditional doesn't make sense.

diff --git a/account.c b/account.c
index d6e2c2a9efb8e2c9c7a13f13ad9660f97c351a7f..82495b2ff20ebafa2d99f8d835bf7f5f53a24007 100644 (file)
--- a/account.c
+++ b/account.c
@@ -18,9 +18,7 @@
 
 /* remote host account manipulation (POP/IMAP) */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "account.h"

diff --git a/addrbook.c b/addrbook.c
index 70eca96198edd7a5dc3d4d448603f8d33841b865..ef6ffad21f45f8f834b08c4c43964ced8657d6f9 100644 (file)
--- a/addrbook.c
+++ b/addrbook.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_menu.h"

diff --git a/alias.c b/alias.c
index b728cddca9c75e4563c5083fa550fd2de83bbd94..048986269cd9316c96843fdda2a0737f3ec6e797 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_regex.h"

diff --git a/ascii.c b/ascii.c
index 5d2e25343d09aed12b1d8ba850fcaddb08b8b1c2..098e5f7df11bef0485df074e6fb843236b82cf2a 100644 (file)
--- a/ascii.c
+++ b/ascii.c
@@ -26,9 +26,7 @@
  * locale-insensitive.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/attach.c b/attach.c
index e5572eef4d499c7bdc5a8249511fda6934f9d936..b552109160f15862c49c22467e631eb57f11840d 100644 (file)
--- a/attach.c
+++ b/attach.c
@@ -17,9 +17,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_menu.h"

diff --git a/base64.c b/base64.c
index 375e67bcb6c2387b50e8497415dd0708b39a293a..908ae587c3cd5131a20bd64ee5f6fd7576cd01f0 100644 (file)
--- a/base64.c
+++ b/base64.c
@@ -39,9 +39,7 @@
  *
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mime.h"

diff --git a/bcache.c b/bcache.c
index f8ef756ce5acd8f39157ef728a7048605f90c217..cd9d95b6ea508d510ba690799d913adf743591c6 100644 (file)
--- a/bcache.c
+++ b/bcache.c
@@ -17,9 +17,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif                         /* HAVE_CONFIG_H */
 
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/browser.c b/browser.c
index d636df4267a2fdaef58ac842713d352ca032259c..03cabf11e9daf8a2f105b8a1c4e7ce8471f6f8e9 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/buffy.c b/buffy.c
index f71d920c8a0f47e5ae00ff81dc0908c1414ad528..17749ea79394efc4d3234ef7321fde1335944aa4 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -17,9 +17,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "buffy.h"

diff --git a/charset.c b/charset.c
index 20b63d5f0913d78032133d2cb9ace1e85819e9dc..e2e21bcb69ce7c367b2892ed054393277b4a4932 100644 (file)
--- a/charset.c
+++ b/charset.c
@@ -19,9 +19,7 @@
  *     Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <string.h>
 #include <stdio.h>

diff --git a/color.c b/color.c
index 0ab0abc859ed99a7cc7b99d421636877a4a05dbb..2f217c2fe6872bb5d71302041a8df92a842725d9 100644 (file)
--- a/color.c
+++ b/color.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/commands.c b/commands.c
index 59f19768ae836df7e0c5f88760aaaa0168524ac8..6e0fa39d3fd39fa4538dde2d61581a866fb358d6 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -17,9 +17,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "filter.h"

diff --git a/complete.c b/complete.c
index 163ff11c3fd82f42741173549e5700787999aead..ed6ab253172eac0678531dd61b7d17f2872f8c4b 100644 (file)
--- a/complete.c
+++ b/complete.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #ifdef USE_IMAP

diff --git a/compose.c b/compose.c
index 768c856cdfb83eefafe72f37ce3664486cd2978a..5f248eed824ec68823acc2ef79e23e26605c0141 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -17,9 +17,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/compress.c b/compress.c
index 39e525469f5010125329dfe8f9e42724f6f88a7c..deb8d8e2c360528f5f658162bf12cec517674e69 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <errno.h>
 #include <string.h>

diff --git a/copy.c b/copy.c
index 43267ca5df344f174747fc9a52ec7d1ea88caab2..a30b1f163b6ae82a0a0ae559bb1c4123b1be3ae7 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mailbox.h"

diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index 1db3bb9b89f3ba57aba59aeded214c87db380caa..2ac4ecaba76f751a82293f6b372da5f60a07a33d 100644 (file)
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -21,9 +21,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_crypt.h"

diff --git a/crypt-mod-pgp-classic.c b/crypt-mod-pgp-classic.c
index 4de70f02db4be66fd70433e44903d14a8c1124fc..795a8aaf4e426ae79a6eda550c98e029640a4665 100644 (file)
--- a/crypt-mod-pgp-classic.c
+++ b/crypt-mod-pgp-classic.c
@@ -20,9 +20,7 @@
     This is a crytpo module wrapping the classic pgp code.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "crypt-mod.h"
 #include "pgp.h"

diff --git a/crypt-mod-pgp-gpgme.c b/crypt-mod-pgp-gpgme.c
index 13193999a5ff9c0a3957c2fa953cc57b95728a78..8bd0cf48da5f5e863c4b7542cf6ff2044543adc6 100644 (file)
--- a/crypt-mod-pgp-gpgme.c
+++ b/crypt-mod-pgp-gpgme.c
@@ -20,9 +20,7 @@
     This is a crytpo module wrapping the gpgme based pgp code.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #ifdef CRYPT_BACKEND_GPGME
 

diff --git a/crypt-mod-smime-classic.c b/crypt-mod-smime-classic.c
index 7e341dfc8c03ad595388975426afc772902fc053..5f564ffb8744dee12985bfced5a37c539eaa21b9 100644 (file)
--- a/crypt-mod-smime-classic.c
+++ b/crypt-mod-smime-classic.c
@@ -20,9 +20,7 @@
     This is a crytpo module wrapping the classic smime code.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "crypt-mod.h"
 #include "smime.h"

diff --git a/crypt-mod-smime-gpgme.c b/crypt-mod-smime-gpgme.c
index d0cab74f5ba2bc9b14977c889d2ecfb1d59b34fc..7838a29cdd710081c0be8092a99afb1900aa6a1d 100644 (file)
--- a/crypt-mod-smime-gpgme.c
+++ b/crypt-mod-smime-gpgme.c
@@ -20,9 +20,7 @@
     This is a crytpo module wrapping the gpgme based smime code.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #ifdef CRYPT_BACKEND_GPGME
 

diff --git a/crypt-mod.c b/crypt-mod.c
index 25238c69daa245c96814584b8eed40fd808e696e..f97cfa8d025dda15a2c5de5e81a6c4787cef1bda 100644 (file)
--- a/crypt-mod.c
+++ b/crypt-mod.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "crypt-mod.h"
 

diff --git a/crypt.c b/crypt.c
index 252005e3a201c1f9346e29eab3bec78687c2122f..8132f16513d0169a8ac2f0ca6ee544631412d57f 100644 (file)
--- a/crypt.c
+++ b/crypt.c
@@ -21,9 +21,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/cryptglue.c b/cryptglue.c
index 6a0f79b5db502f5e462f3505b49e9ec4bb97679a..06c7974971ad41b525c5eacd7f750cc436b1c0e6 100644 (file)
--- a/cryptglue.c
+++ b/cryptglue.c
@@ -28,9 +28,7 @@
    contained in this file and the functions implemented by the crypto
    modules.  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_crypt.h"

diff --git a/curs_lib.c b/curs_lib.c
index 88aec322d3eaabc24a090dc432726a9d7aa8695d..94d13a0eb5ca5ecb75651b5feaeb5883d36a5165 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -17,9 +17,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_menu.h"

diff --git a/curs_main.c b/curs_main.c
index db47a4b1bd618e7b4512ab43cdf0f149e9207739..5ae804a42e3c589c8579b8714cc81cd8f39f8ea1 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/date.c b/date.c
index aa45afdd0774bd57f41d29ec7ad154fa3858f9c3..28ef8e5bfd1b51767a57de4f5a1b4b902bc7ee95 100644 (file)
--- a/date.c
+++ b/date.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include <string.h>

diff --git a/doc/makedoc.c b/doc/makedoc.c
index f77e9368a6d73bce7ac6b2ce365c8cefe58b735c..0672892ac5f92105d04b983aa0f578c44a186089 100644 (file)
--- a/doc/makedoc.c
+++ b/doc/makedoc.c
@@ -27,9 +27,7 @@
  **
  **/
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/dotlock.c b/dotlock.c
index 157a7b21eb2516e41d572c4378eec5d20431f8e9..e46b59dab5c3b40ac5984ea0fd7d2db20f1faf41 100644 (file)
--- a/dotlock.c
+++ b/dotlock.c
@@ -24,9 +24,7 @@
  * macro.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/edit.c b/edit.c
index 886a900e86e44700668632fa52ecf4aac9000ba4..9c1c4055fa8d3197b9e438f3afbff18232e69584 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -18,9 +18,7 @@
 
 /* Close approximation of the mailx(1) builtin editor for sending mail. */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/editmsg.c b/editmsg.c
index 2db86835c15d0195b988834752c38b4a25224ea0..c2331cb321e5bd99bcaa61cc841725b0c05c33c0 100644 (file)
--- a/editmsg.c
+++ b/editmsg.c
@@ -21,9 +21,7 @@
 
 /* simple, editor-based message editing */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "copy.h"

diff --git a/enter.c b/enter.c
index bd14f584cafd4ee54c3f426cffa81fc4ddd855b6..c3137506353e2f7dcfe733c75e726ece5614bb5e 100644 (file)
--- a/enter.c
+++ b/enter.c
@@ -17,9 +17,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_menu.h"

diff --git a/extlib.c b/extlib.c
index 922d622b9184faa4bf39cfa88353353d32d62313..00005e8f0633d254c4d3a50d27f6ef72b45b7135 100644 (file)
--- a/extlib.c
+++ b/extlib.c
@@ -27,9 +27,7 @@
 #define WHERE
 #define _EXTLIB_C
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdlib.h>
 #include "lib.h"

diff --git a/filter.c b/filter.c
index 8ffdcdc4da5674f2b8cc3313492977b3295097c4..08e4ae1eefa97338c641d63a9f7183d4194c87cb 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/flags.c b/flags.c
index 577984b48debcb9690f57e077f920e88d11ed6cc..22039770cd746e5223eb16df9370d42932e79798 100644 (file)
--- a/flags.c
+++ b/flags.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/from.c b/from.c
index 340c17a2538096a32252529c7fd4e6f11ba36b35..8acfa6e2087d09a8125f5d786f589795592614fe 100644 (file)
--- a/from.c
+++ b/from.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 

diff --git a/getdomain.c b/getdomain.c
index 3d89cf00ed581c564c98ced13a20637e87def9aa..730b195760d6d0ff9dd75162a89c174283340053 100644 (file)
--- a/getdomain.c
+++ b/getdomain.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <string.h>
 #include <unistd.h>

diff --git a/gnupgparse.c b/gnupgparse.c
index 20ddc8ac6623d56f12959f60e33087679f6e185e..d3f83d60709e2ad9e0862ab8ed8ac7bb2b63c047 100644 (file)
--- a/gnupgparse.c
+++ b/gnupgparse.c
@@ -30,9 +30,7 @@
  *
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/group.c b/group.c
index 4e10c709a535de9c1398f4c035a9b2075a9c9aab..32b6af8abc3e41bc687cd4e8a87fa27c90ff9e4f 100644 (file)
--- a/group.c
+++ b/group.c
@@ -17,9 +17,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/handler.c b/handler.c
index 096edfba7291c2ba1abf8cdae2cf8ac01e488fef..66e11c9c9b435fdc870edb416e2a7d5a6c9bdcc8 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/hash.c b/hash.c
index 9095206592cb5f450d80bb47d4bc81924d22d9b3..ed0642ad585db0ddfdf023fbe3cdf6b55350ac4e 100644 (file)
--- a/hash.c
+++ b/hash.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/hcache.c b/hcache.c
index 95d4fcc4ad66b7f6a04b72edbc9a034250a131e0..687790977e3398c3e1fb71ea30a5353122b38456 100644 (file)
--- a/hcache.c
+++ b/hcache.c
@@ -19,9 +19,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif                         /* HAVE_CONFIG_H */
 
 #if !(HAVE_BDB || HAVE_GDBM || HAVE_KC || HAVE_LMDB || HAVE_QDBM || HAVE_TC)
 #error "No hcache backend defined"

diff --git a/hdrline.c b/hdrline.c
index 42ca3b93e2b12b17f5b13d3de4832ca50845bce5..3e90bbfe0fb814c4e3c9ec539c5465c7e35bc3d1 100644 (file)
--- a/hdrline.c
+++ b/hdrline.c
@@ -18,9 +18,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/headers.c b/headers.c
index 898c34f25e5beead5163ae47f5394683e475d345..0d47d3ded1547e08bd50ed603a6842c33ec1349f 100644 (file)
--- a/headers.c
+++ b/headers.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_crypt.h"

diff --git a/help.c b/help.c
index 64c9bd8f3ec41018c0c57cddda318de4ca835242..6d6ab3582202eea8473228ec6faae46ba0ddd285 100644 (file)
--- a/help.c
+++ b/help.c
@@ -18,9 +18,7 @@
 
 #define HELP_C
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/history.c b/history.c
index 74a0e3e9dae2f5bb26a0c7f4b3be02c83e2c657c..53834d5902585467ec5fd888e59039d0c4bdd9a9 100644 (file)
--- a/history.c
+++ b/history.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "history.h"

diff --git a/hook.c b/hook.c
index 151adc5d3a5c2f827e1e6869e76147465238d131..01fc259265340557a44026e64329d79be0944ec5 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mailbox.h"

diff --git a/imap/auth.c b/imap/auth.c
index f5848873807b7ce3623b64f7bf7790fe4cb8c16a..54fb6be9dcddf2f93047d8c992b4c50343a49270 100644 (file)
--- a/imap/auth.c
+++ b/imap/auth.c
@@ -20,9 +20,7 @@
 
 /* IMAP login/authentication code */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "imap_private.h"

diff --git a/imap/auth_anon.c b/imap/auth_anon.c
index 5ce294459c7d4763c2713cbcb672544ed248d973..327b35a43202ccfd0e8b664c74fbdc25320632b3 100644 (file)
--- a/imap/auth_anon.c
+++ b/imap/auth_anon.c
@@ -18,9 +18,7 @@
 
 /* IMAP login/authentication code */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "imap_private.h"

diff --git a/imap/auth_cram.c b/imap/auth_cram.c
index 6235accc22584b1c29c1165ab2938540708ab1c4..033fea0248df1e3863cb95cf54a3f2f49c1ee947 100644 (file)
--- a/imap/auth_cram.c
+++ b/imap/auth_cram.c
@@ -18,9 +18,7 @@
 
 /* IMAP login/authentication code */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "imap_private.h"

diff --git a/imap/auth_gss.c b/imap/auth_gss.c
index 740e1e6296c6beab458407bffa3fa7145cd277b3..342a10dc73ac05572aa4f85cdae2f729e020fa24 100644 (file)
--- a/imap/auth_gss.c
+++ b/imap/auth_gss.c
@@ -18,9 +18,7 @@
 
 /* GSS login/authentication code */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "imap_private.h"

diff --git a/imap/auth_login.c b/imap/auth_login.c
index fc78730eff8cbbdf0184d50ce6af05fa38031cc3..7925f665d4b10c7f10d6151a4931e570565dd931 100644 (file)
--- a/imap/auth_login.c
+++ b/imap/auth_login.c
@@ -18,9 +18,7 @@
 
 /* plain LOGIN support */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "imap_private.h"

diff --git a/imap/auth_plain.c b/imap/auth_plain.c
index c2041f8d1aab78898af4d84831415744371ffb75..0e2ac0db6f81246860f1efcea71c486757385c05 100644 (file)
--- a/imap/auth_plain.c
+++ b/imap/auth_plain.c
@@ -19,9 +19,7 @@
 
 /* SASL PLAIN support */
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "mutt.h"
 #include "imap_private.h"

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index 78417e43328fb15097490355b9b069e9d5fc2b67..bed4ecedc5aa0c0cb29fb87422580e5974634c8b 100644 (file)
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -18,9 +18,7 @@
 
 /* SASL login/authentication code */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_sasl.h"

diff --git a/imap/browse.c b/imap/browse.c
index e5b91590680fd5eb0b545f4f2b07c1783bb4bc68..b32c05938f5d81ffc48a3091a769b443974cfb4f 100644 (file)
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -19,9 +19,7 @@
 
 /* Mutt browser support routines */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdlib.h>
 #include <ctype.h>

diff --git a/imap/command.c b/imap/command.c
index 434f82f625f31462c9d9f703c503b9dbcd0e6fff..820288352ccff1da69778dbb38d8c1785b0977ab 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -21,9 +21,7 @@
 /* command.c: routines for sending commands to an IMAP server and parsing
  *  responses */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "imap_private.h"

diff --git a/imap/imap.c b/imap/imap.c
index 26b2f54418b008ba624d3367fe320be9ce8e678a..dec521bad4ffc057013966f69cb77c3410746a42 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -20,9 +20,7 @@
 
 /* Support for IMAP4rev1, with the occasional nod to IMAP 4. */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mx.h"

diff --git a/imap/message.c b/imap/message.c
index 0e9a1b3bbf86dedb2ccbb331cdf22d3cb85a4908..7363fc12c251c95b19bca5fed900175b9886f0de 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -20,9 +20,7 @@
 
 /* message parsing/updating functions */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <errno.h>
 #include <stdlib.h>

diff --git a/imap/utf7.c b/imap/utf7.c
index 1996f15f72896611eba1592638cc5e45c95d9c04..90b677a5fd6560561a0b0e1b49ec251f2e030c8a 100644 (file)
--- a/imap/utf7.c
+++ b/imap/utf7.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "charset.h"

diff --git a/init.c b/init.c
index 7965a5bb2942406d73a37457d58c76722ee708d6..bd3fe62400c78c4b4c5923cbc78183797528e6e3 100644 (file)
--- a/init.c
+++ b/init.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "filter.h"

diff --git a/keymap.c b/keymap.c
index 8462f198188d7cac81c2cbc7b3865c6596a80333..c4b7e9300dfb8f5c25a8af90b83c91dbed044cb5 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_menu.h"

diff --git a/lib.c b/lib.c
index b33d3a963d64f1ad658b59a2fc7f3323d0323edb..dcc8f7060a07d7be7db1a35817f49e4043199f1a 100644 (file)
--- a/lib.c
+++ b/lib.c
@@ -26,9 +26,7 @@
  * some of our "standard" functions in external programs, too.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <string.h>
 #include <ctype.h>

diff --git a/main.c b/main.c
index b03995ea2c9ae325afd470ad5da3fd1fa80cdf3d..840b5d9411974e3130a8baa5a7f87ab2386b0e72 100644 (file)
--- a/main.c
+++ b/main.c
@@ -20,9 +20,7 @@
 
 #define MAIN_C 1
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/mbox.c b/mbox.c
index 1e665cb18caea85f9131ad488838f78a96f82e23..ce270c01f70a51c623e26942360b7a6aae778442 100644 (file)
--- a/mbox.c
+++ b/mbox.c
@@ -18,9 +18,7 @@
 
 /* This file contains code to parse ``mbox'' and ``mmdf'' style mailboxes */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mailbox.h"

diff --git a/mbyte.c b/mbyte.c
index 3b2e8549d8512d189fea8ada55d3eb499164be2c..6ca4a0212a1a6cff02745a5a907219d29497fb87 100644 (file)
--- a/mbyte.c
+++ b/mbyte.c
@@ -20,9 +20,7 @@
  * Japanese support by TAKIZAWA Takashi <taki@luna.email.ne.jp>.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mbyte.h"

diff --git a/md5.c b/md5.c
index bbe9134a5460380170cbd699b6db9c789e59b2de..b40fe11093aff9695a3b329ec2ad0b22b5737c8a 100644 (file)
--- a/md5.c
+++ b/md5.c
@@ -20,9 +20,7 @@
 
 /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "md5.h"
 

diff --git a/menu.c b/menu.c
index dbe17bbe5a71fe4ca09e32220a96c2080404c996..bad86d739aafc7ee3e5f1557d98edd49d53d5c64 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/mh.c b/mh.c
index b4b6aa004de555bbf05cd3a395705817e70fba5b..e684fabdfbcdda48b453bf77c036d84f02c0ccb3 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -23,9 +23,7 @@
  * mailboxes.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mailbox.h"

diff --git a/mutt_idna.c b/mutt_idna.c
index 7603a02fb24788d2249cbec06e816ebffbd4159a..92a7ba81e92c28f7f048bbdacd9d5f215e6e63b2 100644 (file)
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "charset.h"

diff --git a/mutt_lua.c b/mutt_lua.c
index e5b35ce3de7ac5eba08fb11b71961d95a81afa03..99b40b3a141cd15f8dc364c4d585e21c61d2e09b 100644 (file)
--- a/mutt_lua.c
+++ b/mutt_lua.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <lauxlib.h>
 #include <lua.h>

diff --git a/mutt_notmuch.c b/mutt_notmuch.c
index a7d60e7cc9cc1487326c3033093e9cb9c8d2991b..f80189dd8c9a33fa7ddf702213827aeb4755212d 100644 (file)
--- a/mutt_notmuch.c
+++ b/mutt_notmuch.c
@@ -36,9 +36,7 @@
  *   (or parse URI from another resource)
  */
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <ctype.h>
 #include <dirent.h>

diff --git a/mutt_sasl.c b/mutt_sasl.c
index 657e3d7cab86de095397ddc7ec1607fda1f01497..12c8e80e2e0e5b87d3479da71fefd217f243380a 100644 (file)
--- a/mutt_sasl.c
+++ b/mutt_sasl.c
@@ -18,9 +18,7 @@
 
 /* common SASL helper routines */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "account.h"

diff --git a/mutt_sasl_plain.c b/mutt_sasl_plain.c
index 478e68abb1e1940a866a364587f136987ed3478d..4e78fd23dab26c6bb6a600319e1e140f43ace528 100644 (file)
--- a/mutt_sasl_plain.c
+++ b/mutt_sasl_plain.c
@@ -16,9 +16,7 @@
  *     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "mutt.h"
 #include "mutt_sasl_plain.h"

diff --git a/mutt_socket.c b/mutt_socket.c
index b0267dad2b251831d9ee5f2eb11e1d309593c065..3ea41a1514595b84f508a860a121b6834c30faef 100644 (file)
--- a/mutt_socket.c
+++ b/mutt_socket.c
@@ -18,9 +18,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_socket.h"

diff --git a/mutt_ssl.c b/mutt_ssl.c
index 7f8ae8829a72d70ed4b66c129142c759b0bbad89..dbec6c8b45a497dd765c733992a860b074161bb7 100644 (file)
--- a/mutt_ssl.c
+++ b/mutt_ssl.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <openssl/ssl.h>
 #include <openssl/x509.h>

diff --git a/mutt_ssl_gnutls.c b/mutt_ssl_gnutls.c
index d79fe9fad32c38174a28f25280c2dfd22a6d8456..4a07d3cd80cfbfc2c6d6d1fcc2938f91ed42e796 100644 (file)
--- a/mutt_ssl_gnutls.c
+++ b/mutt_ssl_gnutls.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>

diff --git a/mutt_tunnel.c b/mutt_tunnel.c
index e5af7d70ce3b571927704419b01f264cf1162859..9fe3a7f5cd8d15d739b54037272f4e65c998ba52 100644 (file)
--- a/mutt_tunnel.c
+++ b/mutt_tunnel.c
@@ -17,9 +17,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_socket.h"

diff --git a/muttlib.c b/muttlib.c
index 25c64905200e7c705cfc665d088279f2962745cd..04296a560f2b8d295a5b3c4679b6ed71dc4e59a7 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -17,9 +17,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "buffer.h"
 #include "mutt.h"

diff --git a/mx.c b/mx.c
index f38a2f34fdd371de598d4fb9a1c6bb3df8fac37a..f3ed78c232f1b92b211c7fc79248395813e23a59 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -17,9 +17,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mx.h"

diff --git a/newsrc.c b/newsrc.c
index 0e4f730041a5b906c59e93c2addbdfca515384e4..98239f03332fcc2fc890a52d7e10c5c554c1313e 100644 (file)
--- a/newsrc.c
+++ b/newsrc.c
@@ -18,9 +18,7 @@
  *     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/nntp.c b/nntp.c
index a9cc0fd1506c7a9bb375a88cfcedc9d4bc32b0f7..218a0be203bcaebe9a5c891e7cd8fc532f74ffa1 100644 (file)
--- a/nntp.c
+++ b/nntp.c
@@ -18,9 +18,7 @@
  *     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/pager.c b/pager.c
index 84eccedb8e2f9fed585f25145682743c07a86845..722abfeec9d62e0f046ef25ef3b128e151562f39 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/parse.c b/parse.c
index a97f73d3fe6c58d4ad33a4f3daf3917aee8e13b2..0f9be10fb5b6fe89612839248890f861fdb5b3a1 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_regex.h"

diff --git a/pattern.c b/pattern.c
index 212f518800ed2a225c28af1f861cc947219021b9..8d403c007f4048b8e119c3bc5afc1dd9d3e3e0a5 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mapping.h"

diff --git a/pgp.c b/pgp.c
index ba699629cde5476a16a0cab592214caad4f46a40..71041f49a2fe50e433f0219ad967dd151fc2b566 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -26,9 +26,7 @@
  * a message.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "filter.h"

diff --git a/pgpewrap.c b/pgpewrap.c
index f09fc99db3c5ae37eac2f7c1aceaada02d11a120..28100a3bd76f905251d86a2b77a76d7f0cc9760e 100644 (file)
--- a/pgpewrap.c
+++ b/pgpewrap.c
@@ -4,9 +4,8 @@
  * This code is in the public domain.
  *
  */
-#ifdef HAVE_CONFIG_H
+
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/pgpinvoke.c b/pgpinvoke.c
index f76d682869d7db355e718e9c64a3ee660a8c5987..861919b52406a4814b897158bb194da2ea2609fe 100644 (file)
--- a/pgpinvoke.c
+++ b/pgpinvoke.c
@@ -23,9 +23,7 @@
  * is almost entirely format based.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/pgpkey.c b/pgpkey.c
index 7d4365d37ec78315d45e2a96d12322d72fa8d921..988c354db5f77538722ebf44e256c48c0e205f4c 100644 (file)
--- a/pgpkey.c
+++ b/pgpkey.c
@@ -20,9 +20,7 @@
  *     Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "filter.h"

diff --git a/pgplib.c b/pgplib.c
index 1ba2c055102042c4cb28c71593323a8b0b3f569c..baaf8cf9543dcc375ec583fe2c2aeb65d0492202 100644 (file)
--- a/pgplib.c
+++ b/pgplib.c
@@ -21,9 +21,7 @@
 
 /* Generally useful, pgp-related functions. */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/pgpmicalg.c b/pgpmicalg.c
index eea42edf249fb30e4c791f2dc3583508ed59cf6f..cb7d0d40df1ba7a66c4d06cadb4a8b8698b62d0c 100644 (file)
--- a/pgpmicalg.c
+++ b/pgpmicalg.c
@@ -21,9 +21,7 @@
  * algorithm.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "pgp.h"

diff --git a/pgppacket.c b/pgppacket.c
index 8c8afface52552a2219f286be9b35118c0fb6f2c..d503bedab410b506881c89e26342dcf9a46fb14c 100644 (file)
--- a/pgppacket.c
+++ b/pgppacket.c
@@ -17,9 +17,7 @@
  * MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/pgppubring.c b/pgppubring.c
index 1d2ef983d2c2c7eda59d41c1c12ca9badff7ff1c..027b767d24d8005de0d5d7ff07b50caf7a24ebf2 100644 (file)
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -34,9 +34,7 @@
  *
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/pop.c b/pop.c
index e1007e6cbf96ebcd624e7b5573fefde1ff75b72d..fbc21c98e77d3f3d566851669777fc0cb6101e99 100644 (file)
--- a/pop.c
+++ b/pop.c
@@ -17,9 +17,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/pop_auth.c b/pop_auth.c
index 282b1e0313f5824a3d7abf7c29aed940ca6807ab..b05771857a7b820e65516f7666c5adbc5568c405 100644 (file)
--- a/pop_auth.c
+++ b/pop_auth.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mx.h"

diff --git a/pop_lib.c b/pop_lib.c
index 0363cb7cede6db07a35e1aa8183fc237c2825368..fa2261925f711cc8a9f435a10a8ade91c3db7ec6 100644 (file)
--- a/pop_lib.c
+++ b/pop_lib.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mx.h"

diff --git a/postpone.c b/postpone.c
index ebbf4061d7c0a6808f4d3ad6cc147e286c453e63..23154502aa899e744626f3ee4322224b99d3293a 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -17,9 +17,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_menu.h"

diff --git a/query.c b/query.c
index d1cbfe3d30700170559e0a4e5a58da2a8e366c6e..06a64c427544a784861a31203175293d06692e22 100644 (file)
--- a/query.c
+++ b/query.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "filter.h"

diff --git a/recvattach.c b/recvattach.c
index 8b02b3ed683f535d9fac6e4d5550dd518daa0311..99e165e570598dd56d7e2ea1c05c10363f6f362b 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -17,9 +17,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "filter.h"

diff --git a/recvcmd.c b/recvcmd.c
index 08c03ae98e199aec13063955fbb5a3ea18f6bea1..2a1203f74c66075e52e2267cf5ffcc22e17e78a1 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -19,9 +19,7 @@
  *     Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/remailer.c b/remailer.c
index ff373e4d9cef49c0c562d5f1322b0f85c30577d1..317079dd3a319e84bafefaa88d1171ecd7dd82a8 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -23,9 +23,7 @@
  * Mixmaster support for Mutt
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/resize.c b/resize.c
index 4ed65674a1fbd3fb2ff1539dfb56936c5aaaef0b..18590d9a6eda5fcc018c7c20d4df3fc8d66ce7ca 100644 (file)
--- a/resize.c
+++ b/resize.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/rfc1524.c b/rfc1524.c
index 6f34a911e2d87d76377f0d90b5f3fdf3b45c8a1a..7a2819dfb9781a8f7ed89dd55d7c85d89e0c9e4c 100644 (file)
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -26,9 +26,7 @@
  * rfc1524.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "rfc1524.h"

diff --git a/rfc2047.c b/rfc2047.c
index a9a93a53768cf221cd3bf95041708894d8824bbb..b7fd0d15b4d7f4b9695548c7c76e3cf955eee0fa 100644 (file)
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -17,9 +17,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mime.h"

diff --git a/rfc2231.c b/rfc2231.c
index b2d116365990727ed93a792601a834ced3332c80..9812b21493c04a38160798928d756fea58064b8a 100644 (file)
--- a/rfc2231.c
+++ b/rfc2231.c
@@ -29,9 +29,7 @@
  *
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mime.h"

diff --git a/rfc3676.c b/rfc3676.c
index 640dfc4fcb6cee305a1376583277b7563b1861bb..e6870e33ad0b41c16937489a88d49e5bd783981a 100644 (file)
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -22,9 +22,7 @@
 
 /* This file was originally part of mutt-ng */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/rfc822.c b/rfc822.c
index 56d9a54e1776889b71428cc621a15d8790b3e28e..b457db97f24ae97d7effab060928b7a152875f00 100644 (file)
--- a/rfc822.c
+++ b/rfc822.c
@@ -17,9 +17,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <string.h>
 #include <stdlib.h>

diff --git a/score.c b/score.c
index 36c47bca20ac64e3f3274bcbcf5c8ad5ed671687..c1d1da77fef7773242ad2e99ce666e2e891ec67e 100644 (file)
--- a/score.c
+++ b/score.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "sort.h"

diff --git a/send.c b/send.c
index 1e4d774f63cde2ba8f5446a57e349c014b17df7f..822213210ad059878c103a14855c8de248e4713c 100644 (file)
--- a/send.c
+++ b/send.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "filter.h"

diff --git a/sendlib.c b/sendlib.c
index 00a654a6958a7e0b9469d66218e7f08c4720517d..88e2915d8d4edf40e88c37aa1e0dfdc081cccced 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -18,9 +18,7 @@
 
 #define _SENDLIB_C 1
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/sha1.c b/sha1.c
index 3fb597eee217d7760d0bf3d8a090b70e5ba561c0..9d336e281f8fbc640c8f25b39a57989235bf6640 100644 (file)
--- a/sha1.c
+++ b/sha1.c
@@ -17,9 +17,7 @@
 
 #define SHA1HANDSOFF
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <string.h>
 

diff --git a/sidebar.c b/sidebar.c
index 022dc597a42a15bf30b805d721cca8eb3958c318..ed98e740d3d8e67a203db21602de50b14fe4348a 100644 (file)
--- a/sidebar.c
+++ b/sidebar.c
@@ -18,9 +18,7 @@
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "buffy.h"

diff --git a/signal.c b/signal.c
index 3a032106b73d939ce94190b8d000d089ffaf9039..72d67bb54124d8fdd80767d8cdb2395bad7bb6a5 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/smime.c b/smime.c
index 3fa2c182afaf9d409730435312997e533ba57b0e..6c6e1147af959d9557961edb77fd8f5851e1589e 100644 (file)
--- a/smime.c
+++ b/smime.c
@@ -18,9 +18,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "filter.h"

diff --git a/smtp.c b/smtp.c
index 0a4b321bd83910d5e4f491268c1e425127b29ef0..83123b8b268cb4a3492ba26d063033966bf3dcc3 100644 (file)
--- a/smtp.c
+++ b/smtp.c
@@ -19,9 +19,7 @@
 
 /* This file contains code for direct SMTP delivery of email messages. */
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "mutt.h"
 #include "mutt_curses.h"

diff --git a/sort.c b/sort.c
index 56c132ab3b227eba6cb619bea02b55c0c1d6dfa0..62c24315c5d94966238d409c896d45c275c60dd6 100644 (file)
--- a/sort.c
+++ b/sort.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "sort.h"

diff --git a/status.c b/status.c
index bfc9d250c38fa093b9e9f27e15f34edba668fb4f..12a11d588b017857ff3853c0f671a88b7168ac2a 100644 (file)
--- a/status.c
+++ b/status.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mutt_menu.h"

diff --git a/system.c b/system.c
index 4a3532b1b587d7382add9091eadc48683e4929ba..9e75f1f6bcef72c6b6fbbac03e812846939d9641 100644 (file)
--- a/system.c
+++ b/system.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #ifdef USE_IMAP

diff --git a/thread.c b/thread.c
index bd97beceb606aec4d963bd36db0bb8eb308080dd..c9693e13d8a0915fb75d18acb7909d288d42cb1d 100644 (file)
--- a/thread.c
+++ b/thread.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "sort.h"

diff --git a/url.c b/url.c
index c7d600f7c10d24994eabdbdbe50142c91e217d92..fa5d485ffc0ff5ca045b93b4ab09d90a7daab11f 100644 (file)
--- a/url.c
+++ b/url.c
@@ -20,9 +20,7 @@
  * A simple URL parser.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mapping.h"

diff --git a/utf8.c b/utf8.c
index d1d06770459160a5d0c6ddea42ba92aa01ee7cba..255d71c969e1349413ffe0c432c02a42b6499064 100644 (file)
--- a/utf8.c
+++ b/utf8.c
@@ -1,6 +1,4 @@
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #ifndef HAVE_WC_FUNCS
 

diff --git a/version.c b/version.c
index 81f57ccc626d2e75cd184734b63b3948e23740d0..40417f5a7ece5c1f17996c6607d0b9b316251e98 100644 (file)
--- a/version.c
+++ b/version.c
@@ -18,9 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <string.h>

diff --git a/wcscasecmp.c b/wcscasecmp.c
index 52388c93289873e49c693db41d391507befc7733..049f0fcb9aa39f431958792fd59929ef878dff07 100644 (file)
--- a/wcscasecmp.c
+++ b/wcscasecmp.c
@@ -16,9 +16,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "mutt.h"
 #include "mbyte.h"

diff --git a/wcwidth.c b/wcwidth.c
index 0b94d736f71fb4e009f326fad8d86219e057ec20..0b494c79f7e9701a6f1fcf71a2af7b5c8ed0409d 100644 (file)
--- a/wcwidth.c
+++ b/wcwidth.c
@@ -20,9 +20,7 @@
  *   unsigned short to fix compiler warnings, 2007-11-13, Rocco Rutte
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #ifndef HAVE_WC_FUNCS