remove preprocessor else clauses

Remove the #else clauses from the preprocessor now that these symbols
are always defined:
    USE_COMPRESSED
    USE_IMAP
    USE_NNTP
    USE_POP
    USE_SIDEBAR
    USE_SMTP
    USE_SOCKET

diff --git a/browser.c b/browser.c
index 4e3fe6c3d0ae26e0f964d02b7e24cad75b635dd9..a91a0e75e67917926e5815f2dfc6d7f1d60aeeb6 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -1398,11 +1398,7 @@ void _mutt_select_file(char *f, size_t flen, int flags, char ***files, int *numf
           }
         }
 
-#ifdef USE_NNTP
-        if (buffy || option(OPTNEWS))
-#else
-        if (buffy)
-#endif
+        if (buffy || option(OPTNEWS)) /* USE_NNTP */
         {
           strfcpy(f, state.entry[menu->current].name, flen);
           mutt_expand_path(f, flen);

diff --git a/main.c b/main.c
index a57fc37f0a83617d96a4948465693ee33ce558c3..af59da4def8b85fecfd26a0357b57f9dd487589d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -249,13 +249,9 @@ int main(int argc, char **argv, char **environ)
         argv[nargc++] = argv[optind];
     }
 
-#ifdef USE_NNTP
+    /* USE_NNTP 'g:G' */
     if ((i = getopt(argc, argv,
                     "+A:a:Bb:F:f:c:Dd:l:Ee:g:GH:s:i:hm:npQ:RSvxyzZ")) != EOF)
-#else
-    if ((i = getopt(argc, argv,
-                    "+A:a:Bb:F:f:c:Dd:l:Ee:H:s:i:hm:npQ:RSvxyzZ")) != EOF)
-#endif
       switch (i)
       {
         case 'A':

diff --git a/send.c b/send.c
index 9d0c0696a93dfed0be6600fa0b9436b3ff4207d9..ab92750080a9d72b611e6e291f0bf1ce4d836b7b 100644 (file)
--- a/send.c
+++ b/send.c
@@ -2120,12 +2120,8 @@ int ci_send_message(int flags,      /* send mode */
   else if (!option(OPTNOCURSES) && !(flags & SENDMAILX))
   {
     mutt_message(i != 0 ? _("Sending in background.") :
-#ifdef USE_NNTP
-                          (flags & SENDNEWS) ? _("Article posted.") :
+                          (flags & SENDNEWS) ? _("Article posted.") : /* USE_NNTP */
                                                _("Mail sent."));
-#else
-                          _("Mail sent."));
-#endif
 #ifdef USE_NOTMUCH
     if (option(OPTNOTMUCHRECORD))
       nm_record_message(ctx, finalpath, cur);

diff --git a/system.c b/system.c
index 117bc9c76269f7b919dadb9a440c30e4f7b39924..44844984c3504891d0e566a9a15fc213fedf7ed7 100644 (file)
--- a/system.c
+++ b/system.c
@@ -115,10 +115,7 @@ int _mutt_system(const char *cmd, int flags)
   }
   else if (thepid != -1)
   {
-#ifndef USE_IMAP
-    /* wait for the (first) child process to finish */
-    waitpid(thepid, &rc, 0);
-#else
+#ifdef USE_IMAP
     rc = imap_wait_keepalive(thepid);
 #endif
   }

diff --git a/version.c b/version.c
index 58870853d3f08b5304848d0c25db7bac65a3e65d..1888a1f01a760224ab1dc7c0c6289ea5d5b3f487 100644 (file)
--- a/version.c
+++ b/version.c
@@ -209,8 +209,6 @@ static struct compile_options comp_opts[] = {
 #endif
 #ifdef USE_COMPRESSED
   { "USE_COMPRESSED", 1 },
-#else
-  { "USE_COMPRESSED", 0 },
 #endif
 #ifdef USE_DOTLOCK
   { "USE_DOTLOCK", 1 },
@@ -244,8 +242,6 @@ static struct compile_options comp_opts[] = {
 #endif
 #ifdef USE_IMAP
   { "USE_IMAP", 1 },
-#else
-  { "USE_IMAP", 0 },
 #endif
 #ifdef USE_LUA
   { "USE_LUA", 1 },
@@ -259,13 +255,9 @@ static struct compile_options comp_opts[] = {
 #endif
 #ifdef USE_NNTP
   { "USE_NNTP", 1 },
-#else
-  { "USE_NNTP", 0 },
 #endif
 #ifdef USE_POP
   { "USE_POP", 1 },
-#else
-  { "USE_POP", 0 },
 #endif
 #ifdef USE_SASL
   { "USE_SASL", 1 },
@@ -282,8 +274,6 @@ static struct compile_options comp_opts[] = {
 #endif
 #ifdef USE_SMTP
   { "USE_SMTP", 1 },
-#else
-  { "USE_SMTP", 0 },
 #endif
 #ifdef USE_SSL_GNUTLS
   { "USE_SSL_GNUTLS", 1 },