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
update to pre-4.87 master
[exim.git]
/
src
/
src
/
exim.h
diff --git
a/src/src/exim.h
b/src/src/exim.h
index fb48a43d35718ee3c250d1b5ce08f0bf313bd29c..f94f00b978f8d8a9fe1f7bc9e571a5f8a902ae8b 100644
(file)
--- a/
src/src/exim.h
+++ b/
src/src/exim.h
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 201
4
*/
+/* Copyright (c) University of Cambridge 1995 - 201
5
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-418,7
+418,7
@@
iconv(). It's os.h file defines ICONV_ARG2_TYPE. For the rest, define a default
here. */
#ifndef ICONV_ARG2_TYPE
here. */
#ifndef ICONV_ARG2_TYPE
-# define ICONV_ARG2_TYPE c
onst c
har **
+# define ICONV_ARG2_TYPE char **
#endif
/* One OS uses a different type for the 5th argument of getsockopt */
#endif
/* One OS uses a different type for the 5th argument of getsockopt */
@@
-591,4
+591,9
@@
default to EDQUOT if it exists, otherwise ENOSPC. */
#endif
#endif
#endif
#endif
+/* DANE w/o DNSSEC is useless */
+#if defined(EXPERIMENTAL_DANE) && defined(DISABLE_DNSSEC)
+ #undef DISABLE_DNSSEC
+#endif
+
/* End of exim.h */
/* End of exim.h */