(1) Setting WITH_OLD_DEMIME without WITH_CONTENT_SCAN caused eximon not

to compile; WITH_CONTENT_SCAN was forced in exim.h in this case, but was
not forced for eximon. I have updated buildconfig so that it gets set in
config.h and thus applies everywhere. (2) Fixed some compiler warnings
in the demime.c module. (3) Moved the inclusion of config.h above the
inclusion of mytypes.h and macros.h for eximon, to be the same as for
exim itself.

4 files changed, 19 insertions, 13 deletions

diff --git a/src/exim_monitor/em_hdr.h b/src/exim_monitor/em_hdr.h
index 02cc2fd22..9fd8a18a6 100644
--- a/src/exim_monitor/em_hdr.h
+++ b/src/exim_monitor/em_hdr.h
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/exim_monitor/em_hdr.h,v 1.2 2004/10/07 10:48:02 ph10 Exp $ */
+/* $Cambridge: exim/src/exim_monitor/em_hdr.h,v 1.3 2004/12/29 16:24:03 ph10 Exp $ */
 
 /*************************************************
 *                 Exim Monitor                   *
@@ -95,9 +95,9 @@ that this kind of kludge isn't needed. */
 
 #define MAXPACKET 1024
 
+#include "config.h"
 #include "mytypes.h"
 #include "macros.h"
-#include "config.h"
 
 #include "local_scan.h"
 #include "structs.h"
diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c
index 6adb5d033..ce39a2c53 100644
--- a/src/src/buildconfig.c
+++ b/src/src/buildconfig.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/buildconfig.c,v 1.3 2004/11/05 12:33:59 ph10 Exp $ */
+/* $Cambridge: exim/src/src/buildconfig.c,v 1.4 2004/12/29 16:24:03 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -629,6 +629,19 @@ while (fgets(buffer, sizeof(buffer), base) != NULL)
     continue;
     }
 
+  /* WITH_CONTENT_SCAN is another special case: it must be set if either it or 
+  WITH_OLD_DEMIME is set. */  
+
+  if (strcmp(name, "WITH_CONTENT_SCAN") == 0)
+    {
+    char *wcs = getenv("WITH_CONTENT_SCAN");
+    char *wod = getenv("WITH_OLD_DEMIME");
+    if (wcs != NULL || wod != NULL)
+      fprintf(new, "#define WITH_CONTENT_SCAN     yes\n");
+    else fprintf(new, "/* WITH_CONTENT_SCAN not set */\n");
+    continue;
+    } 
+
   /* Otherwise, check whether a value exists in the environment. Remember if
   it is an AUTH setting or SUPPORT_CRYPTEQ. */
 
diff --git a/src/src/demime.c b/src/src/demime.c
index 724e47561..17adf74f4 100644
--- a/src/src/demime.c
+++ b/src/src/demime.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/demime.c,v 1.2 2004/12/16 15:11:47 tom Exp $ */
+/* $Cambridge: exim/src/src/demime.c,v 1.3 2004/12/29 16:24:03 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -22,7 +22,7 @@ int demime(uschar **listptr) {
   uschar *list = *listptr;
   uschar *option;
   uschar option_buffer[64];
-  unsigned long long mbox_size;
+  unsigned long mbox_size;
   FILE *mbox_file;
   uschar defer_error_buffer[1024];
   int demime_rc = 0;
diff --git a/src/src/exim.h b/src/src/exim.h
index fa7acf8ba..53b70d9d4 100644
--- a/src/src/exim.h
+++ b/src/src/exim.h
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/exim.h,v 1.5 2004/12/21 09:40:01 ph10 Exp $ */
+/* $Cambridge: exim/src/src/exim.h,v 1.6 2004/12/29 16:24:03 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -384,13 +384,6 @@ 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 "dbstuff.h"