Default notifier socket name to spooldir-dependent path even for abstract names

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

diff --git a/src/src/dmarc.h b/src/src/dmarc.h
index 78e2a5b7b7e0d5e31605811353335087a5c2f1b4..c94d939cc05f12662a613bd9553d81f4a1408ece 100644 (file)
--- a/src/src/dmarc.h
+++ b/src/src/dmarc.h
@@ -9,12 +9,12 @@
 /* Portions Copyright (c) 2012, 2013, The Trusted Domain Project;
    All rights reserved, licensed for use per LICENSE.opendmarc. */
 
-#ifdef EXPERIMENTAL_DMARC
+#ifdef SUPPORT_DMARC
 
 # include "opendmarc/dmarc.h"
-# ifdef EXPERIMENTAL_SPF
+# ifdef SUPPORT_SPF
 #  include "spf2/spf.h"
-# endif /* EXPERIMENTAL_SPF */
+# endif /* SUPPORT_SPF */
 
 /* prototypes */
 int dmarc_init();
@@ -23,7 +23,7 @@ int dmarc_process();
 uschar *dmarc_exim_expand_query(int);
 uschar *dmarc_exim_expand_defaults(int);
 uschar *dmarc_auth_results_header(header_line *,uschar *);
-int dmarc_write_history_file();
+static int dmarc_write_history_file();
 
 #define DMARC_AR_HEADER        US"Authentication-Results:"
 #define DMARC_VERIFY_STATUS    1
@@ -58,4 +58,4 @@ int dmarc_write_history_file();
 #define ARES_RESULT_UNKNOWN 11
 #define ARES_RESULT_DISCARD 12
 
-#endif /* EXPERIMENTAL_DMARC */
+#endif /* SUPPORT_DMARC */