CHMOD_COMMAND and TOUCH_COMMAND are needed by exicyclog (bug #602).

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

diff --git a/src/src/exim.h b/src/src/exim.h
index 85571f62ffaf927148c253d98edbfffdbe390db5..a2f422c118525292438311bb014eeed92aa674b9 100644 (file)
--- a/src/src/exim.h
+++ b/src/src/exim.h
@@ -1,10 +1,10 @@
-/* $Cambridge: exim/src/src/exim.h,v 1.17 2005/06/29 10:56:35 ph10 Exp $ */
+/* $Cambridge: exim/src/src/exim.h,v 1.24 2008/01/16 13:44:45 nm4 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2005 */
+/* Copyright (c) University of Cambridge 1995 - 2007 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 
 /* See the file NOTICE for conditions of use and distribution. */
 
 


@@ -75,6 +75,14 @@ making unique names. */
 #define INT_MAX 2147483647
 #endif
 
 #define INT_MAX 2147483647
 #endif
 

+#ifndef INT_MIN
+#define INT_MIN (-INT_MAX - 1)
+#endif
+
+#ifndef SHRT_MAX
+#define SHRT_MAX 32767
+#endif
+

 #ifndef UCHAR_MAX
 #define UCHAR_MAX 255
 #endif
 #ifndef UCHAR_MAX
 #define UCHAR_MAX 255
 #endif


@@ -414,12 +422,11 @@ extern int ferror(FILE *);
 
 /* The header from the PCRE regex package */
 
 
 /* The header from the PCRE regex package */
 

-#include "pcre/pcre.h"
+#include <pcre.h>

 
 /* Exim includes are in several files. Note that local_scan.h #includes
 
 /* 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"
+config.h, mytypes.h, and store.h, so we don't need to mention them explicitly.
+*/

 
 #include "local_scan.h"
 #include "macros.h"
 
 #include "local_scan.h"
 #include "macros.h"


@@ -442,6 +449,9 @@ mytypes.h and store.h, so we don't need to mention them explicitly. */
 #ifdef EXPERIMENTAL_DOMAINKEYS
 #include "dk.h"
 #endif
 #ifdef EXPERIMENTAL_DOMAINKEYS
 #include "dk.h"
 #endif

+#ifdef EXPERIMENTAL_DKIM
+#include "dkim-exim.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. */


@@ -454,6 +464,12 @@ requires various things that are set therein. */
 #include <dlfcn.h>
 #endif
 
 #include <dlfcn.h>
 #endif
 

+#ifdef ENABLE_DISABLE_FSYNC
+#define EXIMfsync(f) (disable_fsync? 0 : fsync(f))
+#else
+#define EXIMfsync(f) fsync(f)
+#endif
+

 /* Backward compatibility; LOOKUP_LSEARCH now includes all three */
 
 #if (!defined LOOKUP_LSEARCH) && (defined LOOKUP_WILDLSEARCH || defined LOOKUP_NWILDLSEARCH)
 /* Backward compatibility; LOOKUP_LSEARCH now includes all three */
 
 #if (!defined LOOKUP_LSEARCH) && (defined LOOKUP_WILDLSEARCH || defined LOOKUP_NWILDLSEARCH)