Renamed SOCKLEN_T as EXIM_SOCKLEN_T to avoid a problem in AIX.

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

diff --git a/src/src/exim.h b/src/src/exim.h
index f7a4f7115cf89cffa5eff010cc076b588b671bd0..42f7980c2ec0b23223022d66e7bc04359976f317 100644 (file)
--- a/src/src/exim.h
+++ b/src/src/exim.h
@@ -1,10 +1,10 @@
-/* $Cambridge: exim/src/src/exim.h,v 1.4 2004/12/16 15:11:47 tom Exp $ */
+/* $Cambridge: exim/src/src/exim.h,v 1.9 2005/03/15 14:09:12 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2004 */
+/* Copyright (c) University of Cambridge 1995 - 2005 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
@@ -107,11 +107,12 @@ in sys/file.h. */
 #include <sysexits.h>
 #endif
 
-/* A few OS don't have socklen_t; their os.h files define SOCKLEN_T to
-be size_t or whatever. */
+/* A few OS don't have socklen_t; their os.h files define EXIM_SOCKLEN_T to
+be size_t or whatever. We used to use SOCKLEN_T, but then it was discovered
+that this is used by the AIX include files. */
 
-#ifndef SOCKLEN_T
-#define SOCKLEN_T socklen_t
+#ifndef EXIM_SOCKLEN_T
+#define EXIM_SOCKLEN_T socklen_t
 #endif
 
 /* Ensure that the sysexits we reference are defined */
@@ -381,13 +382,8 @@ 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, lets clear up some content
-scanning dependencies. */
-#ifdef WITH_OLD_DEMIME
-#define WITH_CONTENT_SCAN
-#endif
+#include "config.h"
 
 #include "local_scan.h"
 #include "macros.h"
@@ -407,6 +403,9 @@ scanning dependencies. */
 #ifdef EXPERIMENTAL_SRS
 #include "srs.h"
 #endif
+#ifdef EXPERIMENTAL_DOMAINKEYS
+#include "dk.h"
+#endif
 
 /* The following stuff must follow the inclusion of config.h because it
 requires various things that are set therein. */