(1) Doubled size of debug_buffer. (2) Output from SpamAssassin test

[exim.git] / src / src / exim.h

diff --git a/src/src/exim.h b/src/src/exim.h
index 397a1368725aede25fd2fec6dd2a0f7dea06a140..fa7acf8bade29c364f803c4b19634d4f9d3e44b9 100644 (file)
--- a/src/src/exim.h
+++ b/src/src/exim.h
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/exim.h,v 1.3 2004/11/24 15:43:36 ph10 Exp $ */
+/* $Cambridge: exim/src/src/exim.h,v 1.5 2004/12/21 09:40:01 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -382,9 +382,17 @@ extern int ferror(FILE *);
 /* Exim includes are in several files. Note that local_scan.h #includes
 mytypes.h and store.h, so we don't need to mention them explicitly. */
 
+#include "config.h"
+
+/* Before including the rest of the Exim headers, let's clear up some content
+scanning dependencies. */
+
+#ifdef WITH_OLD_DEMIME
+#define WITH_CONTENT_SCAN
+#endif
+
 #include "local_scan.h"
 #include "macros.h"
-#include "config.h"
 #include "dbstuff.h"
 #include "structs.h"
 #include "globals.h"
@@ -392,6 +400,16 @@ mytypes.h and store.h, so we don't need to mention them explicitly. */
 #include "dbfunctions.h"
 #include "osfunctions.h"
 
+#ifdef EXPERIMENTAL_BRIGHTMAIL
+#include "bmi_spam.h"
+#endif
+#ifdef EXPERIMENTAL_SPF
+#include "spf.h"
+#endif
+#ifdef EXPERIMENTAL_SRS
+#include "srs.h"
+#endif
+
 /* The following stuff must follow the inclusion of config.h because it
 requires various things that are set therein. */