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 998adc3ea0a924c44a3747b43b55b31d13c17e08..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.
2 2004/11/19 09:45:54 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 *
@@
-279,9
+279,11
@@
header files. I don't suppose they have T_SRV either. */
#endif
/* We use the private type T_ZNS for retrieving the nameservers for the
#endif
/* We use the private type T_ZNS for retrieving the nameservers for the
-enclosing zone of a domain. */
+enclosing zone of a domain, and the private type T_MXH for retrieving
+the MX hostnames only (without their priorities). */
#define T_ZNS (-1)
#define T_ZNS (-1)
+#define T_MXH (-2)
/* The resolv.h header defines __P(x) on some Solaris 2.5.1 systems (without
checking that it is already defined, in fact). This conflicts with other
/* The resolv.h header defines __P(x) on some Solaris 2.5.1 systems (without
checking that it is already defined, in fact). This conflicts with other
@@
-379,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"
@@
-390,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. */