ph10 2004/12/29 16:24:04 GMT
Modified files:
exim-src/exim_monitor em_hdr.h
exim-src/src buildconfig.c demime.c exim.h
Log:
(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.
Revision Changes Path
1.3 +1 -1 exim/exim-src/exim_monitor/em_hdr.h
1.4 +13 -0 exim/exim-src/src/buildconfig.c
1.3 +1 -1 exim/exim-src/src/demime.c
1.6 +0 -7 exim/exim-src/src/exim.h
Index: em_hdr.h
===================================================================
RCS file: /home/cvs/exim/exim-src/exim_monitor/em_hdr.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- em_hdr.h 7 Oct 2004 10:48:02 -0000 1.2
+++ em_hdr.h 29 Dec 2004 16:24:03 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/exim_monitor/em_hdr.h,v 1.2 2004/10/07 10:48:02 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/exim_monitor/em_hdr.h,v 1.3 2004/12/29 16:24:03 ph10 Exp $ */
/*************************************************
* Exim Monitor *
@@ -95,9 +95,9 @@
#define MAXPACKET 1024
+#include "config.h"
#include "mytypes.h"
#include "macros.h"
-#include "config.h"
#include "local_scan.h"
#include "structs.h"
Index: buildconfig.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/buildconfig.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- buildconfig.c 5 Nov 2004 12:33:59 -0000 1.3
+++ buildconfig.c 29 Dec 2004 16:24:03 -0000 1.4
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/buildconfig.c,v 1.3 2004/11/05 12:33:59 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/buildconfig.c,v 1.4 2004/12/29 16:24:03 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -628,6 +628,19 @@
}
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. */
Index: demime.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/demime.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- demime.c 16 Dec 2004 15:11:47 -0000 1.2
+++ demime.c 29 Dec 2004 16:24:03 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/demime.c,v 1.2 2004/12/16 15:11:47 tom Exp $ */
+/* $Cambridge: exim/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 @@
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;
Index: exim.h
===================================================================
RCS file: /home/cvs/exim/exim-src/src/exim.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- exim.h 21 Dec 2004 09:40:01 -0000 1.5
+++ exim.h 29 Dec 2004 16:24:03 -0000 1.6
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/exim.h,v 1.5 2004/12/21 09:40:01 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/exim.h,v 1.6 2004/12/29 16:24:03 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -383,13 +383,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"
