-/* $Cambridge: exim/src/src/macros.h,v 1.5 2004/12/16 15:11:47 tom Exp $ */
+/* $Cambridge: exim/src/src/macros.h,v 1.8 2005/01/12 12:51:55 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. */
a no-op once an SSL session is in progress. */
#ifdef SUPPORT_TLS
-#define mac_smtp_fflush() if (!tls_active) fflush(smtp_out);
+#define mac_smtp_fflush() if (tls_active < 0) fflush(smtp_out);
#else
#define mac_smtp_fflush() fflush(smtp_out);
#endif
order without checking carefully! Furthermore, remember to keep these in step
with the tables of names and response codes in globals.c. */
-/* FIXME: the #ifdef below does not work here. Why? */
-
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
- ACL_WHERE_MIME,
-#endif
- ACL_WHERE_DATA,
- ACL_WHERE_NOTSMTP,
+#ifdef WITH_CONTENT_SCAN /* ) */
+ ACL_WHERE_MIME, /* ) */
+#endif /* ) */
+ ACL_WHERE_DATA, /* ) */
+ ACL_WHERE_NOTSMTP, /* ) */
ACL_WHERE_AUTH, /* These remaining ones are not currently */
ACL_WHERE_CONNECT, /* required to be in a special order so they */