Pull config.h out of protos.h, add to top of every IMAP C file. This should

probably be done to every C file, but the results need testing in case
some files depend on the current (broken) includes.

diff --git a/imap/auth.c b/imap/auth.c
index 0c56e851a022cef3de943993f3e973341b3f70c3..85fd0292d065034d6d35c1e8ab46c2efd21c99f5 100644 (file)
--- a/imap/auth.c
+++ b/imap/auth.c
@@ -20,6 +20,10 @@
 
 /* IMAP login/authentication code */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "mutt.h"
 #include "imap_private.h"
 #include "auth.h"

diff --git a/imap/auth_anon.c b/imap/auth_anon.c
index 252a3d012c5ee4bbb5c703bacb2012b7c57ef09b..ed74a86fe04f7a80e0b87861c25cf1044b52a771 100644 (file)
--- a/imap/auth_anon.c
+++ b/imap/auth_anon.c
@@ -18,6 +18,10 @@
 
 /* IMAP login/authentication code */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "mutt.h"
 #include "imap_private.h"
 #include "auth.h"

diff --git a/imap/auth_cram.c b/imap/auth_cram.c
index 3baa3c8c439a535de8d12a577164d0495a4ca136..75cddc0a13c324ec4ee36e9f98b1d160708f5b5f 100644 (file)
--- a/imap/auth_cram.c
+++ b/imap/auth_cram.c
@@ -18,6 +18,10 @@
 
 /* IMAP login/authentication code */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "mutt.h"
 #include "imap_private.h"
 #include "auth.h"

diff --git a/imap/auth_gss.c b/imap/auth_gss.c
index 03f48d3ac395143c74692d00a6fa11ad8bf41782..3d0f45fb036e266658544c846c0cab193ca0dbdd 100644 (file)
--- a/imap/auth_gss.c
+++ b/imap/auth_gss.c
@@ -18,8 +18,9 @@
 
 /* GSS login/authentication code */
 
-/* for HAVE_HEIMDAL */
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include "mutt.h"
 #include "imap_private.h"

diff --git a/imap/auth_login.c b/imap/auth_login.c
index 7be391d60d65508e99609e3d1d3a49520318c1e1..71b566cad7b1e105ce991ae0565ca1a6bfd479c1 100644 (file)
--- a/imap/auth_login.c
+++ b/imap/auth_login.c
@@ -18,6 +18,10 @@
 
 /* plain LOGIN support */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "mutt.h"
 #include "imap_private.h"
 #include "auth.h"

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index a68c9d427b4d6e10167e51aa6a4c99eab31b89f2..c01f2283ce98962458c19eb3ced18e47ddc7232f 100644 (file)
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -18,6 +18,10 @@
 
 /* SASL login/authentication code */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "mutt.h"
 #include "mutt_sasl.h"
 #include "imap_private.h"

diff --git a/imap/browse.c b/imap/browse.c
index 4a43420ca217cf8d23d7ea3d1285c4c54df7ce66..7eb2634ce3d7ba4feed8f1924f7215e15754b8e7 100644 (file)
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -19,6 +19,10 @@
 
 /* Mutt browser support routines */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <ctype.h>
 

diff --git a/imap/command.c b/imap/command.c
index e7e70443147b61c8944096d755be47c3c3665383..6581efb97ba6fa6a669967ccb9b27ff5bf84904a 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -21,6 +21,10 @@
 /* command.c: routines for sending commands to an IMAP server and parsing
  *  responses */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "mutt.h"
 #include "imap_private.h"
 #include "message.h"

diff --git a/imap/imap.c b/imap/imap.c
index 56848fd92c45230cb5539e52d61a08dc22c31cf0..ac14c9256ce31957c913bddb6dc5b15c4a6eab4d 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -20,6 +20,10 @@
 
 /* Support for IMAP4rev1, with the occasional nod to IMAP 4. */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "mx.h"

diff --git a/imap/message.c b/imap/message.c
index 183933f413c6a1082b973ef5205c6dcb08fb12e0..29770f0b509dea5a26ed3d5c7f1ff5211aac0ff1 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -19,6 +19,10 @@
 
 /* message parsing/updating functions */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <ctype.h>
 

diff --git a/imap/utf7.c b/imap/utf7.c
index 743c1ba7ec0ea45d4b27ea88d44e66224c09eb00..a919abeb1508065a8d7204a93778fb385ee4f3ed 100644 (file)
--- a/imap/utf7.c
+++ b/imap/utf7.c
@@ -16,6 +16,10 @@
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */ 
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "mutt.h"
 #include "charset.h"
 #include "imap_private.h"

diff --git a/protos.h b/protos.h
index 5e99f6432fda7c9b424353e651ebb37f6ee0b3b2..395f5089b91be026c4c044ae1a3301e19b2fb606 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -17,10 +17,6 @@
  */ 
 
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif