join transport logic for DK and DKIM, making it possible to use both at the same...

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

diff --git a/src/src/functions.h b/src/src/functions.h
index e2a1b45d96735a28a2a41b994c11083030581476..6d22b1456251016fd5f2ed56f7f3ef4fc438f2cc 100644 (file)
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/functions.h,v 1.40 2008/01/17 13:03:35 tom Exp $ */
+/* $Cambridge: exim/src/src/functions.h,v 1.41 2008/03/05 21:13:23 tom Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -83,15 +83,12 @@ extern void    deliver_succeeded(address_item *);
 extern int     demime(uschar **);
 #endif
 extern BOOL    directory_make(uschar *, uschar *, int, BOOL);
-#ifdef EXPERIMENTAL_DOMAINKEYS
-extern BOOL    dk_transport_write_message(address_item *, int, int,
-                   int, uschar *, uschar *, uschar *, uschar *, rewrite_rule *,
-                   int, uschar *, uschar *, uschar *, uschar *, uschar *, uschar *);
-#endif
-#ifdef EXPERIMENTAL_DKIM
+#if (defined EXPERIMENTAL_DOMAINKEYS) || (defined EXPERIMENTAL_DKIM)
 extern BOOL    dkim_transport_write_message(address_item *, int, int,
                    int, uschar *, uschar *, uschar *, uschar *, rewrite_rule *,
-                   int, uschar *, uschar *, uschar *, uschar *, uschar *, uschar *);
+                   int, uschar *, uschar *, uschar *, uschar *, uschar *, uschar *,
+                   uschar *, uschar *, uschar *, uschar *, uschar *, uschar *
+                   );
 #endif
 extern dns_address *dns_address_from_rr(dns_answer *, dns_record *);
 extern void    dns_build_reverse(uschar *, uschar *);