git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from EXISCAN branch.
[exim.git]
/
src
/
src
/
exim.h
diff --git
a/src/src/exim.h
b/src/src/exim.h
index 397a1368725aede25fd2fec6dd2a0f7dea06a140..f7a4f7115cf89cffa5eff010cc076b588b671bd0 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.
4 2004/12/16 15:11:47 tom
Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-381,10
+381,16
@@
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. */
/* 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, lets clear up some content
+scanning dependencies. */
+#ifdef WITH_OLD_DEMIME
+#define WITH_CONTENT_SCAN
+#endif
#include "local_scan.h"
#include "macros.h"
#include "local_scan.h"
#include "macros.h"
-#include "config.h"
#include "dbstuff.h"
#include "structs.h"
#include "globals.h"
#include "dbstuff.h"
#include "structs.h"
#include "globals.h"
@@
-392,6
+398,16
@@
mytypes.h and store.h, so we don't need to mention them explicitly. */
#include "dbfunctions.h"
#include "osfunctions.h"
#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. */
/* The following stuff must follow the inclusion of config.h because it
requires various things that are set therein. */