From: Richard Russon Date: Sun, 12 Mar 2017 18:48:35 +0000 (+0000) Subject: drop #if HAVE_CONFIG_H X-Git-Tag: neomutt-20170414~31^2~4 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=90369994055606b5bba2f69fe266a90471e8b9b2;p=neomutt 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 d6e2c2a9e..82495b2ff 100644 --- 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 70eca9619..ef6ffad21 100644 --- 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 b728cddca..048986269 100644 --- 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 5d2e25343..098e5f7df 100644 --- a/ascii.c +++ b/ascii.c @@ -26,9 +26,7 @@ * locale-insensitive. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include #include diff --git a/attach.c b/attach.c index e5572eef4..b55210916 100644 --- 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 375e67bcb..908ae587c 100644 --- 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 f8ef756ce..cd9d95b6e 100644 --- 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 #include diff --git a/browser.c b/browser.c index d636df426..03cabf11e 100644 --- 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 f71d920c8..17749ea79 100644 --- 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 20b63d5f0..e2e21bcb6 100644 --- 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 #include diff --git a/color.c b/color.c index 0ab0abc85..2f217c2fe 100644 --- 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 59f19768a..6e0fa39d3 100644 --- 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 163ff11c3..ed6ab2531 100644 --- 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 768c856cd..5f248eed8 100644 --- 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 39e525469..deb8d8e2c 100644 --- 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 #include diff --git a/copy.c b/copy.c index 43267ca5d..a30b1f163 100644 --- 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 1db3bb9b8..2ac4ecaba 100644 --- 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 4de70f02d..795a8aaf4 100644 --- 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 13193999a..8bd0cf48d 100644 --- 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 7e341dfc8..5f564ffb8 100644 --- 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 d0cab74f5..7838a29cd 100644 --- 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 25238c69d..f97cfa8d0 100644 --- 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 252005e3a..8132f1651 100644 --- 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 6a0f79b5d..06c797497 100644 --- 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 88aec322d..94d13a0eb 100644 --- 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 db47a4b1b..5ae804a42 100644 --- 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 aa45afdd0..28ef8e5bf 100644 --- 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 diff --git a/doc/makedoc.c b/doc/makedoc.c index f77e9368a..0672892ac 100644 --- a/doc/makedoc.c +++ b/doc/makedoc.c @@ -27,9 +27,7 @@ ** **/ -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include #include diff --git a/dotlock.c b/dotlock.c index 157a7b21e..e46b59dab 100644 --- a/dotlock.c +++ b/dotlock.c @@ -24,9 +24,7 @@ * macro. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include #include diff --git a/edit.c b/edit.c index 886a900e8..9c1c4055f 100644 --- 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 2db86835c..c2331cb32 100644 --- 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 bd14f584c..c31375063 100644 --- 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 922d622b9..00005e8f0 100644 --- 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 #include "lib.h" diff --git a/filter.c b/filter.c index 8ffdcdc4d..08e4ae1ee 100644 --- 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 577984b48..22039770c 100644 --- 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 340c17a25..8acfa6e20 100644 --- 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 3d89cf00e..730b19576 100644 --- 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 #include diff --git a/gnupgparse.c b/gnupgparse.c index 20ddc8ac6..d3f83d607 100644 --- a/gnupgparse.c +++ b/gnupgparse.c @@ -30,9 +30,7 @@ * */ -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include #include diff --git a/group.c b/group.c index 4e10c709a..32b6af8ab 100644 --- 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 096edfba7..66e11c9c9 100644 --- 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 #include diff --git a/hash.c b/hash.c index 909520659..ed0642ad5 100644 --- 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 #include diff --git a/hcache.c b/hcache.c index 95d4fcc4a..687790977 100644 --- 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 42ca3b93e..3e90bbfe0 100644 --- 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 898c34f25..0d47d3ded 100644 --- 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 64c9bd8f3..6d6ab3582 100644 --- 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 74a0e3e9d..53834d590 100644 --- 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 151adc5d3..01fc25926 100644 --- 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 f58488738..54fb6be9d 100644 --- 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 5ce294459..327b35a43 100644 --- 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 6235accc2..033fea024 100644 --- 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 740e1e629..342a10dc7 100644 --- 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 fc78730ef..7925f665d 100644 --- 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 c2041f8d1..0e2ac0db6 100644 --- 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 78417e433..bed4ecedc 100644 --- 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 e5b915906..b32c05938 100644 --- 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 #include diff --git a/imap/command.c b/imap/command.c index 434f82f62..820288352 100644 --- 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 26b2f5441..dec521bad 100644 --- 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 0e9a1b3bb..7363fc12c 100644 --- 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 #include diff --git a/imap/utf7.c b/imap/utf7.c index 1996f15f7..90b677a5f 100644 --- 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 7965a5bb2..bd3fe6240 100644 --- 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 8462f1981..c4b7e9300 100644 --- 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 b33d3a963..dcc8f7060 100644 --- 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 #include diff --git a/main.c b/main.c index b03995ea2..840b5d941 100644 --- 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 1e665cb18..ce270c01f 100644 --- 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 3b2e8549d..6ca4a0212 100644 --- a/mbyte.c +++ b/mbyte.c @@ -20,9 +20,7 @@ * Japanese support by TAKIZAWA Takashi . */ -#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 bbe9134a5..b40fe1109 100644 --- a/md5.c +++ b/md5.c @@ -20,9 +20,7 @@ /* Written by Ulrich Drepper , 1995. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include "md5.h" diff --git a/menu.c b/menu.c index dbe17bbe5..bad86d739 100644 --- 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 b4b6aa004..e684fabdf 100644 --- 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 7603a02fb..92a7ba81e 100644 --- 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 e5b35ce3d..99b40b3a1 100644 --- 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 #include diff --git a/mutt_notmuch.c b/mutt_notmuch.c index a7d60e7cc..f80189dd8 100644 --- 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 #include diff --git a/mutt_sasl.c b/mutt_sasl.c index 657e3d7ca..12c8e80e2 100644 --- 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 478e68abb..4e78fd23d 100644 --- 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 b0267dad2..3ea41a151 100644 --- 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 7f8ae8829..dbec6c8b4 100644 --- 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 #include diff --git a/mutt_ssl_gnutls.c b/mutt_ssl_gnutls.c index d79fe9fad..4a07d3cd8 100644 --- 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 #include diff --git a/mutt_tunnel.c b/mutt_tunnel.c index e5af7d70c..9fe3a7f5c 100644 --- 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 25c649052..04296a560 100644 --- 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 f38a2f34f..f3ed78c23 100644 --- 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 0e4f73004..98239f033 100644 --- 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 a9cc0fd15..218a0be20 100644 --- 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 84eccedb8..722abfeec 100644 --- 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 a97f73d3f..0f9be10fb 100644 --- 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 212f51880..8d403c007 100644 --- 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 ba699629c..71041f49a 100644 --- 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 f09fc99db..28100a3bd 100644 --- 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 #include diff --git a/pgpinvoke.c b/pgpinvoke.c index f76d68286..861919b52 100644 --- 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 #include diff --git a/pgpkey.c b/pgpkey.c index 7d4365d37..988c354db 100644 --- 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 1ba2c0551..baaf8cf95 100644 --- 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 #include diff --git a/pgpmicalg.c b/pgpmicalg.c index eea42edf2..cb7d0d40d 100644 --- 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 8c8afface..d503bedab 100644 --- 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 #include diff --git a/pgppubring.c b/pgppubring.c index 1d2ef983d..027b767d2 100644 --- a/pgppubring.c +++ b/pgppubring.c @@ -34,9 +34,7 @@ * */ -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include #include diff --git a/pop.c b/pop.c index e1007e6cb..fbc21c98e 100644 --- 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 282b1e031..b05771857 100644 --- 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 0363cb7ce..fa2261925 100644 --- 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 ebbf4061d..23154502a 100644 --- 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 d1cbfe3d3..06a64c427 100644 --- 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 8b02b3ed6..99e165e57 100644 --- 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 08c03ae98..2a1203f74 100644 --- 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 ff373e4d9..317079dd3 100644 --- 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 4ed65674a..18590d9a6 100644 --- 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 6f34a911e..7a2819dfb 100644 --- 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 a9a93a537..b7fd0d15b 100644 --- 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 b2d116365..9812b2149 100644 --- 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 640dfc4fc..e6870e33a 100644 --- 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 #include diff --git a/rfc822.c b/rfc822.c index 56d9a54e1..b457db97f 100644 --- 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 #include diff --git a/score.c b/score.c index 36c47bca2..c1d1da77f 100644 --- 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 1e4d774f6..822213210 100644 --- 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 00a654a69..88e2915d8 100644 --- 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 3fb597eee..9d336e281 100644 --- a/sha1.c +++ b/sha1.c @@ -17,9 +17,7 @@ #define SHA1HANDSOFF -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include diff --git a/sidebar.c b/sidebar.c index 022dc597a..ed98e740d 100644 --- 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 3a032106b..72d67bb54 100644 --- 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 3fa2c182a..6c6e1147a 100644 --- 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 0a4b321bd..83123b8b2 100644 --- 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 56c132ab3..62c24315c 100644 --- 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 bfc9d250c..12a11d588 100644 --- 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 4a3532b1b..9e75f1f6b 100644 --- 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 bd97beceb..c9693e13d 100644 --- 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 c7d600f7c..fa5d485ff 100644 --- 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 d1d067704..255d71c96 100644 --- 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 81f57ccc6..40417f5a7 100644 --- 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 #include diff --git a/wcscasecmp.c b/wcscasecmp.c index 52388c932..049f0fcb9 100644 --- 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 0b94d736f..0b494c79f 100644 --- 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