git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TFO: cleanup the TCP pure ack of SMTP banner
[exim.git]
/
src
/
src
/
exim.h
diff --git
a/src/src/exim.h
b/src/src/exim.h
index 0638167aad2c2e69016c77f0efa5c45cd51764bd..bb8e4f6e24f8d7b3df4d0fc652c182f40f96357c 100644
(file)
--- a/
src/src/exim.h
+++ b/
src/src/exim.h
@@
-87,6
+87,13
@@
making unique names. */
# include <limits.h>
#endif
# include <limits.h>
#endif
+#ifdef EXIM_HAVE_INOTIFY
+# include <sys/inotify.h>
+#endif
+#ifdef EXIM_HAVE_KEVENT
+# include <sys/event.h>
+#endif
+
/* C99 integer types, figure out how to undo this if needed for older systems */
#include <inttypes.h>
/* C99 integer types, figure out how to undo this if needed for older systems */
#include <inttypes.h>
@@
-493,13
+500,13
@@
config.h, mytypes.h, and store.h, so we don't need to mention them explicitly.
#ifdef SUPPORT_SPF
# include "spf.h"
#endif
#ifdef SUPPORT_SPF
# include "spf.h"
#endif
-#ifdef EXPERIMENTAL_SRS
+#ifdef EXPERIMENTAL_SRS
_ALT
# include "srs.h"
#endif
#ifndef DISABLE_DKIM
# include "dkim.h"
#endif
# include "srs.h"
#endif
#ifndef DISABLE_DKIM
# include "dkim.h"
#endif
-#ifdef
EXPERIMENTAL
_DMARC
+#ifdef
SUPPORT
_DMARC
# include "dmarc.h"
# include <opendmarc/dmarc.h>
#endif
# include "dmarc.h"
# include <opendmarc/dmarc.h>
#endif
@@
-541,9
+548,11
@@
union sockaddr_46 {
/* If DISABLE_TLS is defined, ensure that USE_GNUTLS is not defined
so that if USE_GNUTLS *is* set, we can assume DISABLE_TLS is not set.
/* If DISABLE_TLS is defined, ensure that USE_GNUTLS is not defined
so that if USE_GNUTLS *is* set, we can assume DISABLE_TLS is not set.
+Ditto USE_OPENSSL.
Likewise, OSCP, AUTH_TLS and CERTNAMES cannot be supported. */
#ifdef DISABLE_TLS
Likewise, OSCP, AUTH_TLS and CERTNAMES cannot be supported. */
#ifdef DISABLE_TLS
+# undef USE_OPENSSL
# undef USE_GNUTLS
# ifndef DISABLE_OCSP
# define DISABLE_OCSP
# undef USE_GNUTLS
# ifndef DISABLE_OCSP
# define DISABLE_OCSP
@@
-597,5
+606,13
@@
default to EDQUOT if it exists, otherwise ENOSPC. */
# define EXIM_GROUPLIST_SIZE NGROUPS_MAX
#endif
# define EXIM_GROUPLIST_SIZE NGROUPS_MAX
#endif
+/* Linux has TCP_CORK, FreeBSD has TCP_NOPUSH; they do pretty much the same */
+
+#ifdef TCP_CORK
+# define EXIM_TCP_CORK TCP_CORK
+#elif defined(TCP_NOPUSH)
+# define EXIM_TCP_CORK TCP_NOPUSH
+#endif
+
#endif
/* End of exim.h */
#endif
/* End of exim.h */