Define ACL_SMTP_MIME unconditionally in macros.h to avoid too much clutter in acl.c

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

diff --git a/src/src/macros.h b/src/src/macros.h
index 57fa3bd12d7adbe16f0719e510087d9c036d17d7..d69da22f7cc048c3d3c7a6e855fa5544cc5d4e69 100644 (file)
--- a/src/src/macros.h
+++ b/src/src/macros.h
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/macros.h,v 1.8 2005/01/12 12:51:55 ph10 Exp $ */
+/* $Cambridge: exim/src/src/macros.h,v 1.10 2005/03/10 08:56:03 tom Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -231,7 +231,7 @@ enum {
 
 #define FTEST_NONE     0    /* Not filter testing */
 #define FTEST_USER     1    /* Testing user filter */
-#define FTEST_SYSTEM   2    /* Testing system filter */ 
+#define FTEST_SYSTEM   2    /* Testing system filter */
 
 /* Returns from the routing, transport and authentication functions (not all
 apply to all of them). Some other functions also use these convenient values,
@@ -746,9 +746,11 @@ enum { ACL_WHERE_RCPT,       /* Some controls are for RCPT only */
        ACL_WHERE_MAIL,       /* )                                           */
        ACL_WHERE_PREDATA,    /* ) There are several tests for "in message", */
                              /* ) implemented by <= WHERE_NOTSMTP           */
-#ifdef WITH_CONTENT_SCAN     /* )                                           */
+
+/* Remove next line in case of removeing WITH_CONTENT_SCAN.
+   ACL_WHERE_MIME is defined unconditionally to avoid clutter in acl.c */
        ACL_WHERE_MIME,       /* )                                           */
-#endif                       /* )                                           */
+
        ACL_WHERE_DATA,       /* )                                           */
        ACL_WHERE_NOTSMTP,    /* )                                           */