From ef6cd2f939fc3598bd19260e63edecef991195f1 Mon Sep 17 00:00:00 2001 From: Richard Russon Date: Wed, 20 Dec 2017 14:46:03 +0000 Subject: [PATCH] move conditional includes after others --- alias.c | 8 ++++---- browser.c | 8 ++++---- commands.c | 6 +++--- compose.c | 6 +++--- conn/conn.h | 6 +++--- curs_lib.c | 6 +++--- curs_main.c | 6 +++--- edit.c | 6 +++--- handler.c | 6 +++--- imap/browse.c | 6 +++--- main.c | 6 +++--- menu.c | 6 +++--- muttlib.c | 13 ++++++------- ncrypt/crypt_gpgme.c | 6 +++--- ncrypt/pgp.c | 8 ++++---- ncrypt/smime.c | 8 ++++---- pager.c | 8 ++++---- pattern.c | 12 ++++++------ query.c | 6 +++--- recvattach.c | 6 +++--- system.c | 4 ++-- version.c | 2 +- 22 files changed, 74 insertions(+), 75 deletions(-) diff --git a/alias.c b/alias.c index e3041cbc1..4eef21aaf 100644 --- a/alias.c +++ b/alias.c @@ -23,9 +23,6 @@ #include "config.h" #include #include -#ifdef ENABLE_NLS -#include -#endif #include #include #include @@ -34,8 +31,8 @@ #include #include "mutt/mutt.h" #include "mutt.h" -#include "address.h" #include "alias.h" +#include "address.h" #include "envelope.h" #include "globals.h" #include "mutt_charset.h" @@ -43,6 +40,9 @@ #include "mutt_idna.h" #include "options.h" #include "protos.h" +#ifdef ENABLE_NLS +#include +#endif struct Address *mutt_lookup_alias(const char *s) { diff --git a/browser.c b/browser.c index 933bd9d82..8ff53fd7b 100644 --- a/browser.c +++ b/browser.c @@ -25,9 +25,6 @@ #include #include #include -#ifdef ENABLE_NLS -#include -#endif #include #include #include @@ -42,9 +39,9 @@ #include "mutt/mutt.h" #include "conn/conn.h" #include "mutt.h" +#include "browser.h" #include "attach.h" #include "body.h" -#include "browser.h" #include "buffy.h" #include "context.h" #include "format_flags.h" @@ -63,6 +60,9 @@ #include "protos.h" #include "sort.h" #include "url.h" +#ifdef ENABLE_NLS +#include +#endif #ifdef USE_IMAP #include "imap/imap.h" #endif diff --git a/commands.c b/commands.c index bc62250df..1db7f378d 100644 --- a/commands.c +++ b/commands.c @@ -24,9 +24,6 @@ #include "config.h" #include #include -#ifdef ENABLE_NLS -#include -#endif #include #include #include @@ -60,6 +57,9 @@ #include "parameter.h" #include "protos.h" #include "sort.h" +#ifdef ENABLE_NLS +#include +#endif #ifdef USE_IMAP #include "imap/imap.h" #endif diff --git a/compose.c b/compose.c index e69e58c63..7adaa8892 100644 --- a/compose.c +++ b/compose.c @@ -23,9 +23,6 @@ #include "config.h" #include -#ifdef ENABLE_NLS -#include -#endif #include #include #include @@ -57,6 +54,9 @@ #include "options.h" #include "protos.h" #include "sort.h" +#ifdef ENABLE_NLS +#include +#endif #ifdef MIXMASTER #include "remailer.h" #endif diff --git a/conn/conn.h b/conn/conn.h index 3a723e1ec..1fb506227 100644 --- a/conn/conn.h +++ b/conn/conn.h @@ -41,14 +41,14 @@ #include "account.h" #include "conn_globals.h" #include "connection.h" +#include "sasl_plain.h" +#include "socket.h" +#include "tunnel.h" #ifdef USE_SASL #include "sasl.h" #endif -#include "sasl_plain.h" -#include "socket.h" #ifdef USE_SSL #include "ssl.h" #endif -#include "tunnel.h" #endif /* _CONN_CONN_H */ diff --git a/curs_lib.c b/curs_lib.c index 285c80454..4c7806917 100644 --- a/curs_lib.c +++ b/curs_lib.c @@ -27,9 +27,6 @@ #include #include #include -#ifdef ENABLE_NLS -#include -#endif #include #include #include @@ -55,6 +52,9 @@ #include "options.h" #include "pager.h" #include "protos.h" +#ifdef ENABLE_NLS +#include +#endif #ifdef HAVE_ISWBLANK #include #endif diff --git a/curs_main.c b/curs_main.c index 76d2e86e8..a92cf42df 100644 --- a/curs_main.c +++ b/curs_main.c @@ -23,9 +23,6 @@ #include "config.h" #include #include -#ifdef ENABLE_NLS -#include -#endif #include #include #include @@ -55,6 +52,9 @@ #include "sort.h" #include "tags.h" #include "thread.h" +#ifdef ENABLE_NLS +#include +#endif #ifdef HAVE_NCURSESW_NCURSES_H #include #elif defined(HAVE_NCURSES_NCURSES_H) diff --git a/edit.c b/edit.c index 57ae237cc..b4dfd7e62 100644 --- a/edit.c +++ b/edit.c @@ -25,9 +25,6 @@ #include "config.h" #include #include -#ifdef ENABLE_NLS -#include -#endif #include #include #include @@ -46,6 +43,9 @@ #include "mutt_idna.h" #include "options.h" #include "protos.h" +#ifdef ENABLE_NLS +#include +#endif /* * SLcurses_waddnstr() can't take a "const char *", so this is only diff --git a/handler.c b/handler.c index f93c2dc01..4cfac8079 100644 --- a/handler.c +++ b/handler.c @@ -24,9 +24,6 @@ #include #include #include -#ifdef ENABLE_NLS -#include -#endif #include #include #include @@ -55,6 +52,9 @@ #include "rfc1524.h" #include "rfc3676.h" #include "state.h" +#ifdef ENABLE_NLS +#include +#endif #define BUFI_SIZE 1000 #define BUFO_SIZE 2000 diff --git a/imap/browse.c b/imap/browse.c index a13961dee..e9d02d74f 100644 --- a/imap/browse.c +++ b/imap/browse.c @@ -34,9 +34,6 @@ */ #include "config.h" -#ifdef ENABLE_NLS -#include -#endif #include #include #include @@ -53,6 +50,9 @@ #include "mutt_regex.h" #include "options.h" #include "protos.h" +#ifdef ENABLE_NLS +#include +#endif /** * add_folder - Format and add an IMAP folder to the browser diff --git a/main.c b/main.c index b1cff104d..745c4f774 100644 --- a/main.c +++ b/main.c @@ -26,9 +26,6 @@ #include "config.h" #include -#ifdef ENABLE_NLS -#include -#endif #include #include #include @@ -59,6 +56,9 @@ #include "protos.h" #include "url.h" #include "version.h" +#ifdef ENABLE_NLS +#include +#endif #ifdef USE_SIDEBAR #include "sidebar.h" #endif diff --git a/menu.c b/menu.c index ad139e124..91ea41d72 100644 --- a/menu.c +++ b/menu.c @@ -22,9 +22,6 @@ #include "config.h" #include -#ifdef ENABLE_NLS -#include -#endif #include #include #include @@ -44,6 +41,9 @@ #include "pattern.h" #include "protos.h" #include "tags.h" +#ifdef ENABLE_NLS +#include +#endif #ifdef USE_SIDEBAR #include "sidebar.h" #endif diff --git a/muttlib.c b/muttlib.c index d5b9287a3..6d4249320 100644 --- a/muttlib.c +++ b/muttlib.c @@ -26,9 +26,6 @@ #include #include #include -#ifdef ENABLE_NLS -#include -#endif #include #include #include @@ -58,20 +55,22 @@ #include "mutt_charset.h" #include "mutt_curses.h" #include "mutt_regex.h" -#include "tags.h" - #include "mx.h" #include "ncrypt/ncrypt.h" #include "options.h" #include "parameter.h" #include "protos.h" +#include "tags.h" #include "url.h" -#ifdef USE_IMAP -#include "imap/imap.h" +#ifdef ENABLE_NLS +#include #endif #ifdef HAVE_SYS_SYSCALL_H #include #endif +#ifdef USE_IMAP +#include "imap/imap.h" +#endif static const char *xdg_env_vars[] = { [XDG_CONFIG_HOME] = "XDG_CONFIG_HOME", diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c index efd08f8e5..863d274a3 100644 --- a/ncrypt/crypt_gpgme.c +++ b/ncrypt/crypt_gpgme.c @@ -33,9 +33,6 @@ #include #include #include -#ifdef ENABLE_NLS -#include -#endif #include #include #include @@ -68,6 +65,9 @@ #include "protos.h" #include "sort.h" #include "state.h" +#ifdef ENABLE_NLS +#include +#endif /* Values used for comparing addresses. */ #define CRYPT_KV_VALID 1 diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c index d9adcd9d9..b623f8902 100644 --- a/ncrypt/pgp.c +++ b/ncrypt/pgp.c @@ -31,9 +31,6 @@ */ #include "config.h" -#ifdef ENABLE_NLS -#include -#endif #include #include #include @@ -45,6 +42,7 @@ #include #include "mutt/mutt.h" #include "mutt.h" +#include "pgp.h" #include "address.h" #include "body.h" #include "crypt.h" @@ -59,12 +57,14 @@ #include "ncrypt.h" #include "options.h" #include "parameter.h" -#include "pgp.h" #include "pgpinvoke.h" #include "pgplib.h" #include "pgpmicalg.h" #include "protos.h" #include "state.h" +#ifdef ENABLE_NLS +#include +#endif char PgpPass[LONG_STRING]; time_t PgpExptime = 0; /* when does the cached passphrase expire? */ diff --git a/ncrypt/smime.c b/ncrypt/smime.c index fba62f893..5b47c5a51 100644 --- a/ncrypt/smime.c +++ b/ncrypt/smime.c @@ -23,9 +23,6 @@ */ #include "config.h" -#ifdef ENABLE_NLS -#include -#endif #include #include #include @@ -34,6 +31,7 @@ #include #include "mutt/mutt.h" #include "mutt.h" +#include "smime.h" #include "address.h" #include "alias.h" #include "body.h" @@ -54,8 +52,10 @@ #include "options.h" #include "parameter.h" #include "protos.h" -#include "smime.h" #include "state.h" +#ifdef ENABLE_NLS +#include +#endif /** * struct SmimeCommandContext - Data for a SIME command diff --git a/pager.c b/pager.c index ff85565f0..6c86996e6 100644 --- a/pager.c +++ b/pager.c @@ -25,9 +25,6 @@ #include #include #include -#ifdef ENABLE_NLS -#include -#endif #include #include #include @@ -37,6 +34,7 @@ #include #include "mutt/mutt.h" #include "mutt.h" +#include "pager.h" #include "alias.h" #include "attach.h" #include "body.h" @@ -55,7 +53,6 @@ #include "ncrypt/ncrypt.h" #include "opcodes.h" #include "options.h" -#include "pager.h" #include "pattern.h" #include "protos.h" #include "sort.h" @@ -65,6 +62,9 @@ #ifdef USE_NNTP #include "nntp.h" #endif +#ifdef ENABLE_NLS +#include +#endif #define ISHEADER(x) ((x) == MT_COLOR_HEADER || (x) == MT_COLOR_HDEFAULT) diff --git a/pattern.c b/pattern.c index bfe145cf9..ca83f682e 100644 --- a/pattern.c +++ b/pattern.c @@ -23,9 +23,6 @@ #include "config.h" #include #include -#ifdef ENABLE_NLS -#include -#endif #include #include #include @@ -40,6 +37,7 @@ #include #include "mutt/mutt.h" #include "mutt.h" +#include "pattern.h" #include "address.h" #include "body.h" #include "context.h" @@ -52,18 +50,20 @@ #include "mutt_curses.h" #include "mutt_menu.h" #include "mutt_regex.h" +#include "mx.h" #include "ncrypt/ncrypt.h" #include "opcodes.h" #include "options.h" -#include "pattern.h" #include "protos.h" #include "state.h" +#include "tags.h" #include "thread.h" +#ifdef ENABLE_NLS +#include +#endif #ifdef USE_IMAP #include "imap/imap.h" #endif -#include "mx.h" -#include "tags.h" #ifdef USE_NOTMUCH #include "mutt_notmuch.h" #endif diff --git a/query.c b/query.c index 674d9ff0b..dd03a2084 100644 --- a/query.c +++ b/query.c @@ -21,9 +21,6 @@ */ #include "config.h" -#ifdef ENABLE_NLS -#include -#endif #include #include #include @@ -45,6 +42,9 @@ #include "mutt_menu.h" #include "opcodes.h" #include "protos.h" +#ifdef ENABLE_NLS +#include +#endif /** * struct Query - An entry from an external address-book diff --git a/recvattach.c b/recvattach.c index 3c5ab6041..0b3d3451a 100644 --- a/recvattach.c +++ b/recvattach.c @@ -22,9 +22,6 @@ */ #include "config.h" -#ifdef ENABLE_NLS -#include -#endif #include #include #include @@ -53,6 +50,9 @@ #include "protos.h" #include "rfc1524.h" #include "state.h" +#ifdef ENABLE_NLS +#include +#endif static void mutt_update_recvattach_menu(struct AttachCtx *actx, struct Menu *menu, int init); diff --git a/system.c b/system.c index 50b98b7aa..9d4a2ff71 100644 --- a/system.c +++ b/system.c @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include #include "mutt/mutt.h" #include "mutt.h" @@ -31,8 +33,6 @@ #ifdef USE_IMAP #include "imap/imap.h" #endif -#include -#include /** * mutt_system - Run an external command diff --git a/version.c b/version.c index 6d38c398d..d4351f21b 100644 --- a/version.c +++ b/version.c @@ -29,12 +29,12 @@ #include #include #include "mutt/mutt.h" +#include "mutt_curses.h" #ifdef HAVE_STRINGPREP_H #include #elif defined(HAVE_IDN_STRINGPREP_H) #include #endif -#include "mutt_curses.h" /* #include "protos.h" */ const char *mutt_make_version(void); -- 2.40.0