[PATCH] Fix CVS head: undo config.h cleanup
Hello,
I am really annoyed. I spend now *2 days* on debugging bugs which would
never be introduced if people would actually test their changes
*before* comitting/contributing.
A guideline which would prevent this annoying introducing:
- Compile mutt on a 32bit and a 64 bit architecture and see if
you can still open a maildir/imap/mbox/mh mailbox, delete a message.
- Running valgrind[1] on a x86 Architecture and open the mailboxes
again and look for obious errors:
==12367== Conditional jump or move depends on uninitialised value(s)
==12367== at 0x80A5A61: unlink_message (thread.c:472)
==12367== by 0x80A64D8: mutt_sort_threads (thread.c:819)
==12367== by 0x80A43B9: mutt_sort_headers (sort.c:291)
==12367== by 0x8060A44: update_index (curs_main.c:322)
==12367== by 0x8067343: mutt_index_menu (curs_main.c:608)
==12367== by 0x807A59F: main (main.c:936)
==12367== Conditional jump or move depends on uninitialised value(s)
==12367== at 0x8053138: mutt_buffy_check (buffy.c:333)
==12367== by 0x8062F71: mutt_index_menu (curs_main.c:1235)
==12367== by 0x807A59F: main (main.c:936)
==12367== Conditional jump or move depends on uninitialised value(s)
==12367== at 0x8053138: mutt_buffy_check (buffy.c:333)
==12367== by 0x8067241: mutt_index_menu (curs_main.c:640)
==12367== by 0x807A59F: main (main.c:936)
The attached patch undo the recent config.h cleanup and fixes at least
the expunge/new mail bug maybe also the screen detach bug.
TLR, please apply the patch - which is as usual against CVS HEAD.
[1] http://valgrind.kde.org/
valgrind --tool=memcheck --run-libc-freeres=no --num-callers=10 \
--show-reachable=yes --leak-check=yes --error-limit=no \
--log-file=/tmp/valgrind ./mutt
Greetings,
Thomas
diff -Nru a/account.c b/account.c
--- a/account.c 2005-02-05 13:49:05 +01:00
+++ b/account.c 2005-02-05 13:49:05 +01:00
@@ -18,10 +18,6 @@
/* remote host account manipulation (POP/IMAP) */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "account.h"
#include "url.h"
diff -Nru a/addrbook.c b/addrbook.c
--- a/addrbook.c 2005-02-05 13:49:03 +01:00
+++ b/addrbook.c 2005-02-05 13:49:03 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_menu.h"
#include "mapping.h"
diff -Nru a/alias.c b/alias.c
--- a/alias.c 2005-02-05 13:49:04 +01:00
+++ b/alias.c 2005-02-05 13:49:04 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_regex.h"
#include "mutt_curses.h"
diff -Nru a/ascii.c b/ascii.c
--- a/ascii.c 2005-02-05 13:49:04 +01:00
+++ b/ascii.c 2005-02-05 13:49:04 +01:00
@@ -26,10 +26,6 @@
* locale-insensitive.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include "ascii.h"
diff -Nru a/attach.c b/attach.c
--- a/attach.c 2005-02-05 13:49:04 +01:00
+++ b/attach.c 2005-02-05 13:49:04 +01:00
@@ -17,10 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
diff -Nru a/base64.c b/base64.c
--- a/base64.c 2005-02-05 13:49:04 +01:00
+++ b/base64.c 2005-02-05 13:49:04 +01:00
@@ -39,10 +39,6 @@
*
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mime.h"
diff -Nru a/browser.c b/browser.c
--- a/browser.c 2005-02-05 13:49:03 +01:00
+++ b/browser.c 2005-02-05 13:49:03 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
diff -Nru a/buffy.c b/buffy.c
--- a/buffy.c 2005-02-05 13:49:04 +01:00
+++ b/buffy.c 2005-02-05 13:49:04 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "buffy.h"
#include "mailbox.h"
diff -Nru a/charset.c b/charset.c
--- a/charset.c 2005-02-05 13:49:05 +01:00
+++ b/charset.c 2005-02-05 13:49:05 +01:00
@@ -19,9 +19,6 @@
* Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
#include <string.h>
#include <stdio.h>
diff -Nru a/color.c b/color.c
--- a/color.c 2005-02-05 13:49:05 +01:00
+++ b/color.c 2005-02-05 13:49:05 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
#include "mapping.h"
diff -Nru a/commands.c b/commands.c
--- a/commands.c 2005-02-05 13:49:04 +01:00
+++ b/commands.c 2005-02-05 13:49:04 +01:00
@@ -17,10 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
diff -Nru a/complete.c b/complete.c
--- a/complete.c 2005-02-05 13:49:05 +01:00
+++ b/complete.c 2005-02-05 13:49:05 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#ifdef USE_IMAP
#include "mailbox.h"
diff -Nru a/compose.c b/compose.c
--- a/compose.c 2005-02-05 13:49:04 +01:00
+++ b/compose.c 2005-02-05 13:49:04 +01:00
@@ -17,10 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_idna.h"
diff -Nru a/copy.c b/copy.c
--- a/copy.c 2005-02-05 13:49:03 +01:00
+++ b/copy.c 2005-02-05 13:49:03 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mailbox.h"
#include "mx.h"
diff -Nru a/crypt-gpgme.c b/crypt-gpgme.c
--- a/crypt-gpgme.c 2005-02-05 13:49:04 +01:00
+++ b/crypt-gpgme.c 2005-02-05 13:49:04 +01:00
@@ -20,9 +20,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
#ifdef CRYPT_BACKEND_GPGME
diff -Nru a/crypt-mod-pgp-classic.c b/crypt-mod-pgp-classic.c
--- a/crypt-mod-pgp-classic.c 2005-02-05 13:49:05 +01:00
+++ b/crypt-mod-pgp-classic.c 2005-02-05 13:49:05 +01:00
@@ -20,10 +20,6 @@
This is a crytpo module wrapping the classic pgp code.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "crypt-mod.h"
#include "pgp.h"
diff -Nru a/crypt-mod-pgp-gpgme.c b/crypt-mod-pgp-gpgme.c
--- a/crypt-mod-pgp-gpgme.c 2005-02-05 13:49:04 +01:00
+++ b/crypt-mod-pgp-gpgme.c 2005-02-05 13:49:04 +01:00
@@ -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 -Nru a/crypt-mod-smime-classic.c b/crypt-mod-smime-classic.c
--- a/crypt-mod-smime-classic.c 2005-02-05 13:49:04 +01:00
+++ b/crypt-mod-smime-classic.c 2005-02-05 13:49:04 +01:00
@@ -20,10 +20,6 @@
This is a crytpo module wrapping the classic smime code.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "crypt-mod.h"
#include "smime.h"
diff -Nru a/crypt-mod-smime-gpgme.c b/crypt-mod-smime-gpgme.c
--- a/crypt-mod-smime-gpgme.c 2005-02-05 13:49:03 +01:00
+++ b/crypt-mod-smime-gpgme.c 2005-02-05 13:49:03 +01:00
@@ -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 -Nru a/crypt-mod.c b/crypt-mod.c
--- a/crypt-mod.c 2005-02-05 13:49:04 +01:00
+++ b/crypt-mod.c 2005-02-05 13:49:04 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "crypt-mod.h"
/* A type an a variable to keep track of registered crypto modules. */
diff -Nru a/crypt.c b/crypt.c
--- a/crypt.c 2005-02-05 13:49:04 +01:00
+++ b/crypt.c 2005-02-05 13:49:05 +01:00
@@ -21,9 +21,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
#include "mutt.h"
#include "mutt_curses.h"
diff -Nru a/cryptglue.c b/cryptglue.c
--- a/cryptglue.c 2005-02-05 13:49:03 +01:00
+++ b/cryptglue.c 2005-02-05 13:49:03 +01:00
@@ -28,10 +28,6 @@
contained in this file and the functions implemented by the crypto
modules. */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_crypt.h"
diff -Nru a/curs_lib.c b/curs_lib.c
--- a/curs_lib.c 2005-02-05 13:49:05 +01:00
+++ b/curs_lib.c 2005-02-05 13:49:05 +01:00
@@ -17,10 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
diff -Nru a/curs_main.c b/curs_main.c
--- a/curs_main.c 2005-02-05 13:49:05 +01:00
+++ b/curs_main.c 2005-02-05 13:49:05 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
diff -Nru a/date.c b/date.c
--- a/date.c 2005-02-05 13:49:05 +01:00
+++ b/date.c 2005-02-05 13:49:05 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include <string.h>
diff -Nru a/dotlock.c b/dotlock.c
--- a/dotlock.c 2005-02-05 13:49:04 +01:00
+++ b/dotlock.c 2005-02-05 13:49:04 +01:00
@@ -24,10 +24,6 @@
* macro.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff -Nru a/edit.c b/edit.c
--- a/edit.c 2005-02-05 13:49:03 +01:00
+++ b/edit.c 2005-02-05 13:49:03 +01:00
@@ -18,10 +18,6 @@
/* Close approximation of the mailx(1) builtin editor for sending mail. */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_idna.h"
diff -Nru a/editmsg.c b/editmsg.c
--- a/editmsg.c 2005-02-05 13:49:04 +01:00
+++ b/editmsg.c 2005-02-05 13:49:04 +01:00
@@ -21,10 +21,6 @@
/* simple, editor-based message editing */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "copy.h"
#include "mailbox.h"
diff -Nru a/enter.c b/enter.c
--- a/enter.c 2005-02-05 13:49:05 +01:00
+++ b/enter.c 2005-02-05 13:49:05 +01:00
@@ -17,10 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
diff -Nru a/extlib.c b/extlib.c
--- a/extlib.c 2005-02-05 13:49:05 +01:00
+++ b/extlib.c 2005-02-05 13:49:05 +01:00
@@ -27,10 +27,6 @@
#define WHERE
#define _EXTLIB_C
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include <stdlib.h>
#include "lib.h"
diff -Nru a/filter.c b/filter.c
--- a/filter.c 2005-02-05 13:49:04 +01:00
+++ b/filter.c 2005-02-05 13:49:04 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include <unistd.h>
diff -Nru a/flags.c b/flags.c
--- a/flags.c 2005-02-05 13:49:05 +01:00
+++ b/flags.c 2005-02-05 13:49:05 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
#include "sort.h"
diff -Nru a/from.c b/from.c
--- a/from.c 2005-02-05 13:49:04 +01:00
+++ b/from.c 2005-02-05 13:49:04 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include <ctype.h>
diff -Nru a/getdomain.c b/getdomain.c
--- a/getdomain.c 2005-02-05 13:49:05 +01:00
+++ b/getdomain.c 2005-02-05 13:49:05 +01:00
@@ -1,7 +1,3 @@
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include <stdio.h>
#include <ctype.h>
#include <string.h>
diff -Nru a/gnupgparse.c b/gnupgparse.c
--- a/gnupgparse.c 2005-02-05 13:49:05 +01:00
+++ b/gnupgparse.c 2005-02-05 13:49:05 +01:00
@@ -30,10 +30,6 @@
*
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff -Nru a/handler.c b/handler.c
--- a/handler.c 2005-02-05 13:49:03 +01:00
+++ b/handler.c 2005-02-05 13:49:03 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
diff -Nru a/hash.c b/hash.c
--- a/hash.c 2005-02-05 13:49:05 +01:00
+++ b/hash.c 2005-02-05 13:49:05 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff -Nru a/hdrline.c b/hdrline.c
--- a/hdrline.c 2005-02-05 13:49:05 +01:00
+++ b/hdrline.c 2005-02-05 13:49:05 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
#include "sort.h"
diff -Nru a/headers.c b/headers.c
--- a/headers.c 2005-02-05 13:49:05 +01:00
+++ b/headers.c 2005-02-05 13:49:05 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_crypt.h"
#include "mutt_idna.h"
diff -Nru a/help.c b/help.c
--- a/help.c 2005-02-05 13:49:04 +01:00
+++ b/help.c 2005-02-05 13:49:04 +01:00
@@ -18,10 +18,6 @@
#define HELP_C
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
#include "keymap.h"
diff -Nru a/history.c b/history.c
--- a/history.c 2005-02-05 13:49:03 +01:00
+++ b/history.c 2005-02-05 13:49:03 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "history.h"
diff -Nru a/hook.c b/hook.c
--- a/hook.c 2005-02-05 13:49:04 +01:00
+++ b/hook.c 2005-02-05 13:49:04 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mailbox.h"
#include "mutt_crypt.h"
diff -Nru a/imap/auth.c b/imap/auth.c
--- a/imap/auth.c 2005-02-05 13:49:05 +01:00
+++ b/imap/auth.c 2005-02-05 13:49:05 +01:00
@@ -20,7 +20,7 @@
/* IMAP login/authentication code */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
diff -Nru a/imap/auth_anon.c b/imap/auth_anon.c
--- a/imap/auth_anon.c 2005-02-05 13:49:05 +01:00
+++ b/imap/auth_anon.c 2005-02-05 13:49:05 +01:00
@@ -18,7 +18,7 @@
/* IMAP login/authentication code */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
diff -Nru a/imap/auth_cram.c b/imap/auth_cram.c
--- a/imap/auth_cram.c 2005-02-05 13:49:03 +01:00
+++ b/imap/auth_cram.c 2005-02-05 13:49:03 +01:00
@@ -18,7 +18,7 @@
/* IMAP login/authentication code */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
diff -Nru a/imap/auth_gss.c b/imap/auth_gss.c
--- a/imap/auth_gss.c 2005-02-05 13:49:04 +01:00
+++ b/imap/auth_gss.c 2005-02-05 13:49:04 +01:00
@@ -18,7 +18,7 @@
/* GSS login/authentication code */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
diff -Nru a/imap/auth_login.c b/imap/auth_login.c
--- a/imap/auth_login.c 2005-02-05 13:49:05 +01:00
+++ b/imap/auth_login.c 2005-02-05 13:49:05 +01:00
@@ -18,7 +18,7 @@
/* plain LOGIN support */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
diff -Nru a/imap/auth_sasl.c b/imap/auth_sasl.c
--- a/imap/auth_sasl.c 2005-02-05 13:49:03 +01:00
+++ b/imap/auth_sasl.c 2005-02-05 13:49:03 +01:00
@@ -18,7 +18,7 @@
/* SASL login/authentication code */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
diff -Nru a/imap/browse.c b/imap/browse.c
--- a/imap/browse.c 2005-02-05 13:49:05 +01:00
+++ b/imap/browse.c 2005-02-05 13:49:05 +01:00
@@ -19,7 +19,7 @@
/* Mutt browser support routines */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
diff -Nru a/imap/command.c b/imap/command.c
--- a/imap/command.c 2005-02-05 13:49:05 +01:00
+++ b/imap/command.c 2005-02-05 13:49:05 +01:00
@@ -21,7 +21,7 @@
/* command.c: routines for sending commands to an IMAP server and parsing
* responses */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
diff -Nru a/imap/imap.c b/imap/imap.c
--- a/imap/imap.c 2005-02-05 13:49:03 +01:00
+++ b/imap/imap.c 2005-02-05 13:49:03 +01:00
@@ -20,7 +20,7 @@
/* Support for IMAP4rev1, with the occasional nod to IMAP 4. */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
diff -Nru a/imap/message.c b/imap/message.c
--- a/imap/message.c 2005-02-05 13:49:05 +01:00
+++ b/imap/message.c 2005-02-05 13:49:05 +01:00
@@ -19,7 +19,7 @@
/* message parsing/updating functions */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
diff -Nru a/imap/utf7.c b/imap/utf7.c
--- a/imap/utf7.c 2005-02-05 13:49:05 +01:00
+++ b/imap/utf7.c 2005-02-05 13:49:05 +01:00
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
diff -Nru a/init.c b/init.c
--- a/init.c 2005-02-05 13:49:03 +01:00
+++ b/init.c 2005-02-05 13:49:03 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mapping.h"
#include "mutt_curses.h"
diff -Nru a/keymap.c b/keymap.c
--- a/keymap.c 2005-02-05 13:49:05 +01:00
+++ b/keymap.c 2005-02-05 13:49:05 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
diff -Nru a/lib.c b/lib.c
--- a/lib.c 2005-02-05 13:49:05 +01:00
+++ b/lib.c 2005-02-05 13:49:05 +01:00
@@ -26,10 +26,6 @@
* some of our "standard" functions in external programs, too.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include <string.h>
#include <ctype.h>
#include <unistd.h>
diff -Nru a/main.c b/main.c
--- a/main.c 2005-02-05 13:49:03 +01:00
+++ b/main.c 2005-02-05 13:49:03 +01:00
@@ -20,10 +20,6 @@
#define MAIN_C 1
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
#include "keymap.h"
diff -Nru a/makedoc.c b/makedoc.c
--- a/makedoc.c 2005-02-05 13:49:05 +01:00
+++ b/makedoc.c 2005-02-05 13:49:05 +01:00
@@ -27,9 +27,8 @@
**
**/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
diff -Nru a/mbox.c b/mbox.c
--- a/mbox.c 2005-02-05 13:49:05 +01:00
+++ b/mbox.c 2005-02-05 13:49:05 +01:00
@@ -18,10 +18,6 @@
/* This file contains code to parse ``mbox'' and ``mmdf'' style mailboxes */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mailbox.h"
#include "mx.h"
diff -Nru a/mbyte.c b/mbyte.c
--- a/mbyte.c 2005-02-05 13:49:05 +01:00
+++ b/mbyte.c 2005-02-05 13:49:05 +01:00
@@ -20,10 +20,6 @@
* Japanese support by TAKIZAWA Takashi <taki@xxxxxxxxxxxxxxxx>.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mbyte.h"
#include "charset.h"
diff -Nru a/md5c.c b/md5c.c
--- a/md5c.c 2005-02-05 13:49:05 +01:00
+++ b/md5c.c 2005-02-05 13:49:05 +01:00
@@ -23,10 +23,6 @@
documentation and/or software.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "md5.h"
/* Constants for MD5Transform routine.
diff -Nru a/menu.c b/menu.c
--- a/menu.c 2005-02-05 13:49:04 +01:00
+++ b/menu.c 2005-02-05 13:49:04 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
diff -Nru a/mh.c b/mh.c
--- a/mh.c 2005-02-05 13:49:04 +01:00
+++ b/mh.c 2005-02-05 13:49:04 +01:00
@@ -22,10 +22,6 @@
* mailboxes.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mailbox.h"
#include "mx.h"
diff -Nru a/mutt.h b/mutt.h
--- a/mutt.h 2005-02-05 13:49:04 +01:00
+++ b/mutt.h 2005-02-05 13:49:04 +01:00
@@ -21,6 +21,8 @@
#ifndef MUTT_H
#define MUTT_H
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
diff -Nru a/mutt_idna.c b/mutt_idna.c
--- a/mutt_idna.c 2005-02-05 13:49:05 +01:00
+++ b/mutt_idna.c 2005-02-05 13:49:05 +01:00
@@ -16,10 +16,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 "charset.h"
#include "mutt_idna.h"
diff -Nru a/mutt_sasl.c b/mutt_sasl.c
--- a/mutt_sasl.c 2005-02-05 13:49:03 +01:00
+++ b/mutt_sasl.c 2005-02-05 13:49:03 +01:00
@@ -18,10 +18,6 @@
/* common SASL helper routines */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "account.h"
#include "mutt_sasl.h"
diff -Nru a/mutt_socket.c b/mutt_socket.c
--- a/mutt_socket.c 2005-02-05 13:49:05 +01:00
+++ b/mutt_socket.c 2005-02-05 13:49:06 +01:00
@@ -18,10 +18,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "globals.h"
#include "mutt_socket.h"
diff -Nru a/mutt_ssl.c b/mutt_ssl.c
--- a/mutt_ssl.c 2005-02-05 13:49:04 +01:00
+++ b/mutt_ssl.c 2005-02-05 13:49:04 +01:00
@@ -16,9 +16,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+/* for SSL NO_* defines */
+#include "config.h"
#include <openssl/ssl.h>
#include <openssl/x509.h>
diff -Nru a/mutt_ssl_gnutls.c b/mutt_ssl_gnutls.c
--- a/mutt_ssl_gnutls.c 2005-02-05 13:49:06 +01:00
+++ b/mutt_ssl_gnutls.c 2005-02-05 13:49:06 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include <gnutls/gnutls.h>
#include <gnutls/x509.h>
diff -Nru a/mutt_ssl_nss.c b/mutt_ssl_nss.c
--- a/mutt_ssl_nss.c 2005-02-05 13:49:04 +01:00
+++ b/mutt_ssl_nss.c 2005-02-05 13:49:04 +01:00
@@ -15,10 +15,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include <prinit.h>
#include <pk11func.h>
#include <prtypes.h>
diff -Nru a/mutt_tunnel.c b/mutt_tunnel.c
--- a/mutt_tunnel.c 2005-02-05 13:49:05 +01:00
+++ b/mutt_tunnel.c 2005-02-05 13:49:05 +01:00
@@ -17,10 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_socket.h"
#include "mutt_tunnel.h"
diff -Nru a/muttlib.c b/muttlib.c
--- a/muttlib.c 2005-02-05 13:49:04 +01:00
+++ b/muttlib.c 2005-02-05 13:49:04 +01:00
@@ -17,10 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
#include "mime.h"
diff -Nru a/mx.c b/mx.c
--- a/mx.c 2005-02-05 13:49:06 +01:00
+++ b/mx.c 2005-02-05 13:49:06 +01:00
@@ -17,10 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mx.h"
#include "rfc2047.h"
diff -Nru a/pager.c b/pager.c
--- a/pager.c 2005-02-05 13:49:06 +01:00
+++ b/pager.c 2005-02-05 13:49:06 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_regex.h"
diff -Nru a/parse.c b/parse.c
--- a/parse.c 2005-02-05 13:49:03 +01:00
+++ b/parse.c 2005-02-05 13:49:03 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_regex.h"
#include "mailbox.h"
diff -Nru a/pattern.c b/pattern.c
--- a/pattern.c 2005-02-05 13:49:06 +01:00
+++ b/pattern.c 2005-02-05 13:49:06 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mapping.h"
#include "keymap.h"
diff -Nru a/pgpinvoke.c b/pgpinvoke.c
--- a/pgpinvoke.c 2005-02-05 13:49:06 +01:00
+++ b/pgpinvoke.c 2005-02-05 13:49:06 +01:00
@@ -23,10 +23,6 @@
* is almost entirely format based.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include <sys/types.h>
#include <sys/stat.h>
diff -Nru a/pgpkey.c b/pgpkey.c
--- a/pgpkey.c 2005-02-05 13:49:04 +01:00
+++ b/pgpkey.c 2005-02-05 13:49:04 +01:00
@@ -20,10 +20,6 @@
* Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
diff -Nru a/pgplib.c b/pgplib.c
--- a/pgplib.c 2005-02-05 13:49:04 +01:00
+++ b/pgplib.c 2005-02-05 13:49:04 +01:00
@@ -21,10 +21,6 @@
/* Generally useful, pgp-related functions. */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff -Nru a/pgpmicalg.c b/pgpmicalg.c
--- a/pgpmicalg.c 2005-02-05 13:49:03 +01:00
+++ b/pgpmicalg.c 2005-02-05 13:49:03 +01:00
@@ -21,10 +21,6 @@
* algorithm.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "pgp.h"
#include "pgppacket.h"
diff -Nru a/pgppacket.c b/pgppacket.c
--- a/pgppacket.c 2005-02-05 13:49:03 +01:00
+++ b/pgppacket.c 2005-02-05 13:49:03 +01:00
@@ -17,10 +17,7 @@
* MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff -Nru a/pgppubring.c b/pgppubring.c
--- a/pgppubring.c 2005-02-05 13:49:06 +01:00
+++ b/pgppubring.c 2005-02-05 13:49:06 +01:00
@@ -34,9 +34,8 @@
*
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
diff -Nru a/pop.c b/pop.c
--- a/pop.c 2005-02-05 13:49:04 +01:00
+++ b/pop.c 2005-02-05 13:49:04 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mx.h"
#include "pop.h"
diff -Nru a/pop_auth.c b/pop_auth.c
--- a/pop_auth.c 2005-02-05 13:49:06 +01:00
+++ b/pop_auth.c 2005-02-05 13:49:06 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mx.h"
#include "md5.h"
diff -Nru a/pop_lib.c b/pop_lib.c
--- a/pop_lib.c 2005-02-05 13:49:05 +01:00
+++ b/pop_lib.c 2005-02-05 13:49:05 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mx.h"
#include "url.h"
diff -Nru a/postpone.c b/postpone.c
--- a/postpone.c 2005-02-05 13:49:05 +01:00
+++ b/postpone.c 2005-02-05 13:49:05 +01:00
@@ -17,10 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_menu.h"
#include "rfc1524.h"
diff -Nru a/query.c b/query.c
--- a/query.c 2005-02-05 13:49:03 +01:00
+++ b/query.c 2005-02-05 13:49:03 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_menu.h"
#include "mutt_idna.h"
diff -Nru a/recvattach.c b/recvattach.c
--- a/recvattach.c 2005-02-05 13:49:04 +01:00
+++ b/recvattach.c 2005-02-05 13:49:04 +01:00
@@ -17,10 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
diff -Nru a/recvcmd.c b/recvcmd.c
--- a/recvcmd.c 2005-02-05 13:49:03 +01:00
+++ b/recvcmd.c 2005-02-05 13:49:03 +01:00
@@ -19,10 +19,6 @@
* Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
diff -Nru a/regex.c b/regex.c
--- a/regex.c 2005-02-05 13:49:04 +01:00
+++ b/regex.c 2005-02-05 13:49:04 +01:00
@@ -50,7 +50,7 @@
#undef _GNU_SOURCE
#define _GNU_SOURCE
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
diff -Nru a/remailer.c b/remailer.c
--- a/remailer.c 2005-02-05 13:49:04 +01:00
+++ b/remailer.c 2005-02-05 13:49:04 +01:00
@@ -23,10 +23,6 @@
* Mixmaster support for Mutt
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
diff -Nru a/resize.c b/resize.c
--- a/resize.c 2005-02-05 13:49:04 +01:00
+++ b/resize.c 2005-02-05 13:49:04 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
diff -Nru a/rfc1524.c b/rfc1524.c
--- a/rfc1524.c 2005-02-05 13:49:03 +01:00
+++ b/rfc1524.c 2005-02-05 13:49:03 +01:00
@@ -26,10 +26,6 @@
* rfc1524.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "rfc1524.h"
diff -Nru a/rfc2047.c b/rfc2047.c
--- a/rfc2047.c 2005-02-05 13:49:06 +01:00
+++ b/rfc2047.c 2005-02-05 13:49:06 +01:00
@@ -17,10 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mime.h"
#include "charset.h"
diff -Nru a/rfc2231.c b/rfc2231.c
--- a/rfc2231.c 2005-02-05 13:49:04 +01:00
+++ b/rfc2231.c 2005-02-05 13:49:04 +01:00
@@ -29,10 +29,6 @@
*
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mime.h"
#include "charset.h"
diff -Nru a/rfc822.c b/rfc822.c
--- a/rfc822.c 2005-02-05 13:49:03 +01:00
+++ b/rfc822.c 2005-02-05 13:49:03 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include <string.h>
#include <ctype.h>
#include <stdlib.h>
diff -Nru a/score.c b/score.c
--- a/score.c 2005-02-05 13:49:03 +01:00
+++ b/score.c 2005-02-05 13:49:03 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "sort.h"
#include <string.h>
diff -Nru a/send.c b/send.c
--- a/send.c 2005-02-05 13:49:03 +01:00
+++ b/send.c 2005-02-05 13:49:03 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
#include "rfc2047.h"
diff -Nru a/sendlib.c b/sendlib.c
--- a/sendlib.c 2005-02-05 13:49:05 +01:00
+++ b/sendlib.c 2005-02-05 13:49:05 +01:00
@@ -18,10 +18,6 @@
#define _SENDLIB_C 1
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
#include "rfc2047.h"
diff -Nru a/sha1.c b/sha1.c
--- a/sha1.c 2005-02-05 13:49:05 +01:00
+++ b/sha1.c 2005-02-05 13:49:05 +01:00
@@ -17,10 +17,6 @@
#define SHA1HANDSOFF
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include <string.h>
#include "sha1.h"
diff -Nru a/signal.c b/signal.c
--- a/signal.c 2005-02-05 13:49:04 +01:00
+++ b/signal.c 2005-02-05 13:49:04 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
diff -Nru a/smime.c b/smime.c
--- a/smime.c 2005-02-05 13:49:05 +01:00
+++ b/smime.c 2005-02-05 13:49:05 +01:00
@@ -18,10 +18,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
diff -Nru a/snprintf.c b/snprintf.c
--- a/snprintf.c 2005-02-05 13:49:04 +01:00
+++ b/snprintf.c 2005-02-05 13:49:04 +01:00
@@ -40,9 +40,7 @@
*
**************************************************************/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF)
diff -Nru a/sort.c b/sort.c
--- a/sort.c 2005-02-05 13:49:04 +01:00
+++ b/sort.c 2005-02-05 13:49:04 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "sort.h"
#include "mutt_idna.h"
diff -Nru a/status.c b/status.c
--- a/status.c 2005-02-05 13:49:07 +01:00
+++ b/status.c 2005-02-05 13:49:07 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
diff -Nru a/system.c b/system.c
--- a/system.c 2005-02-05 13:49:05 +01:00
+++ b/system.c 2005-02-05 13:49:05 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#ifdef USE_IMAP
# include "imap.h"
diff -Nru a/thread.c b/thread.c
--- a/thread.c 2005-02-05 13:49:03 +01:00
+++ b/thread.c 2005-02-05 13:49:03 +01:00
@@ -16,10 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "sort.h"
diff -Nru a/url.c b/url.c
--- a/url.c 2005-02-05 13:49:05 +01:00
+++ b/url.c 2005-02-05 13:49:05 +01:00
@@ -20,10 +20,6 @@
* A simple URL parser.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "mutt.h"
#include "mapping.h"
#include "url.h"
diff -Nru a/utf8.c b/utf8.c
--- a/utf8.c 2005-02-05 13:49:07 +01:00
+++ b/utf8.c 2005-02-05 13:49:07 +01:00
@@ -1,7 +1,3 @@
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#ifndef HAVE_WC_FUNCS
#include <errno.h>
diff -Nru a/wcwidth.c b/wcwidth.c
--- a/wcwidth.c 2005-02-05 13:49:03 +01:00
+++ b/wcwidth.c 2005-02-05 13:49:03 +01:00
@@ -9,10 +9,6 @@
/* Adapted for Mutt by Edmund Grimley Evans.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#ifndef HAVE_WC_FUNCS
#include "mutt.h"