X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fexim.h;h=0de0595b1487d2d4e360f2050fb1a9d844ba846e;hb=46682a6793c54ef6cbccad08283ac35205622aac;hp=e12049a9c158693ba26ef6127b6237ffd2375bbe;hpb=e72cfa5b8529a6fe8e674d70dc83df8bcf5e551c;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/src/src/exim.h b/src/src/exim.h index e12049a9c..0de0595b1 100644 --- a/src/src/exim.h +++ b/src/src/exim.h @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2016 */ +/* Copyright (c) University of Cambridge 1995 - 2018 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -502,7 +502,7 @@ config.h, mytypes.h, and store.h, so we don't need to mention them explicitly. #ifdef EXPERIMENTAL_BRIGHTMAIL # include "bmi_spam.h" #endif -#ifdef EXPERIMENTAL_SPF +#ifdef SUPPORT_SPF # include "spf.h" #endif #ifdef EXPERIMENTAL_SRS @@ -593,14 +593,10 @@ default to EDQUOT if it exists, otherwise ENOSPC. */ #endif /* DANE w/o DNSSEC is useless */ -#if defined(EXPERIMENTAL_DANE) && defined(DISABLE_DNSSEC) -# undef DISABLE_DNSSEC +#if defined(SUPPORT_DANE) && defined(DISABLE_DNSSEC) +# error DANE support requires DNSSEC support #endif -/* Wrapper around read(2) to read all the data we requested (BLOCKING) */ -ssize_t -readn(int fd, void *buffer, size_t len); - /* Some platforms (FreeBSD, OpenBSD, Solaris) do not seem to define this */ #ifndef POLLRDHUP