X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fspf.h;h=2283277df87fdb655dc1d28e10acd0cc6f9f4d0b;hb=85e453f622a540ecc8c86b3817e8b85d8218c474;hp=3d5f621fd6b578f0db1e75b43739446cb6794d89;hpb=eac732adbd59b15f10f4db14414dd1405b488e65;p=exim.git

diff --git a/src/src/spf.h b/src/src/spf.h
index 3d5f621fd..2283277df 100644
--- a/src/src/spf.h
+++ b/src/src/spf.h
@@ -4,13 +4,15 @@
 
 /* Experimental SPF support.
    Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004
-   License: GPL */
+   License: GPL
+   Copyright (c) The Exim Maintainers 2016
+*/
 
-#ifdef EXPERIMENTAL_SPF
+#ifdef SUPPORT_SPF
 
 /* Yes, we do have ns_type. spf.h redefines it if we don't set this. Doh */
-#ifndef HAVE_NS_TYPE
-#define HAVE_NS_TYPE
+#if !defined(HAVE_NS_TYPE) && defined(NS_INADDRSZ)
+# define HAVE_NS_TYPE
 #endif
 #include <spf2/spf.h>
 
@@ -23,8 +25,10 @@ typedef struct spf_result_id {
 } spf_result_id;
 
 /* prototypes */
-int spf_init(uschar *,uschar *);
-int spf_process(const uschar **, uschar *, int);
+void spf_lib_version_report(FILE *);
+BOOL spf_init(void);
+BOOL spf_conn_init(uschar *, uschar *);
+int  spf_process(const uschar **, uschar *, int);
 
 #define SPF_PROCESS_NORMAL  0
 #define SPF_PROCESS_GUESS   1