X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fspf.h;h=3e014bdafe30ae5587e7d314633d900c3d0badb0;hb=b049e2229b68834daa14c0befc6e7a875c466b7a;hp=30583f44066d2fd6137ec0331498d71a11934fbf;hpb=384152a6b0cce686255894a502e4b88743abd356;p=exim.git

diff --git a/src/src/spf.h b/src/src/spf.h
index 30583f440..3e014bdaf 100644
--- a/src/src/spf.h
+++ b/src/src/spf.h
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/spf.h,v 1.4 2005/05/24 08:15:02 tom Exp $ */
+/* $Cambridge: exim/src/src/spf.h,v 1.6 2005/06/27 15:28:45 tom Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -11,32 +11,19 @@
 #ifdef EXPERIMENTAL_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
+#endif
 #include <spf2/spf.h>
 
-
 #include <spf2/spf_dns_resolv.h>
 #include <spf2/spf_dns_cache.h>
 
-
 typedef struct spf_result_id {
   uschar *name;
   int    value;
 } spf_result_id;
 
-/* must be kept in numeric order */
-static spf_result_id spf_result_id_list[] = {
-  { US"pass", 0 },
-  { US"fail", 1 },
-  { US"softfail", 2 },
-  { US"neutral", 3 },
-  { US"err_perm", 4 },
-  { US"err_temp", 5 },
-  { US"none", 6 }
-};
-
-static int spf_result_id_list_size = sizeof(spf_result_id_list)/sizeof(spf_result_id);
-
 /* prototypes */
 int spf_init(uschar *,uschar *);
 int spf_process(uschar **, uschar *);