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
Apply Ian Freislich's patch to fix a spamd timeout problem.
[exim.git]
/
src
/
src
/
exim.h
diff --git
a/src/src/exim.h
b/src/src/exim.h
index ae22894c2a7839bf218efb71fe47156a8930c233..e44cad788f2e671aaca289f0ea1aef5bd31b1eb6 100644
(file)
--- a/
src/src/exim.h
+++ b/
src/src/exim.h
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/exim.h,v 1.
8 2005/03/08 15:32:02 tom
Exp $ */
+/* $Cambridge: exim/src/src/exim.h,v 1.
11 2005/04/27 10:00:18 ph10
Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-60,7
+60,7
@@
making unique names. */
/* Unix includes */
#include <errno.h>
/* Unix includes */
#include <errno.h>
-#if
defined(__svr4__) && defined(__sparc) && ! defined(__EXTENSIONS__)
+#if defined(__svr4__) && defined(__sparc) && ! defined(__EXTENSIONS__)
#define __EXTENSIONS__ /* so that SunOS 5 gets NGROUPS_MAX */
#include <limits.h>
#undef __EXTENSIONS__
#define __EXTENSIONS__ /* so that SunOS 5 gets NGROUPS_MAX */
#include <limits.h>
#undef __EXTENSIONS__
@@
-92,6
+92,7
@@
making unique names. */
#include <sys/file.h>
#include <dirent.h>
#include <netdb.h>
#include <sys/file.h>
#include <dirent.h>
#include <netdb.h>
+#include <poll.h>
#include <pwd.h>
#include <grp.h>
#include <syslog.h>
#include <pwd.h>
#include <grp.h>
#include <syslog.h>
@@
-107,11
+108,12
@@
in sys/file.h. */
#include <sysexits.h>
#endif
#include <sysexits.h>
#endif
-/* A few OS don't have socklen_t; their os.h files define SOCKLEN_T to
-be size_t or whatever. */
+/* A few OS don't have socklen_t; their os.h files define EXIM_SOCKLEN_T to
+be size_t or whatever. We used to use SOCKLEN_T, but then it was discovered
+that this is used by the AIX include files. */
-#ifndef SOCKLEN_T
-#define SOCKLEN_T socklen_t
+#ifndef
EXIM_
SOCKLEN_T
+#define
EXIM_
SOCKLEN_T socklen_t
#endif
/* Ensure that the sysexits we reference are defined */
#endif
/* Ensure that the sysexits we reference are defined */
@@
-206,7
+208,7
@@
or a macro with entries f_frsize and f_bsize. */
#endif
#endif
-#ifndef SIOCGIFCONF
/* HACK for SunOS 5 */
+#ifndef SIOCGIFCONF /* HACK for SunOS 5 */
#include <sys/sockio.h>
#endif
#include <sys/sockio.h>
#endif
@@
-413,7
+415,7
@@
requires various things that are set therein. */
#include <iconv.h>
#endif
#include <iconv.h>
#endif
-#if
def USE_READLINE
+#if
defined(USE_READLINE) || defined(EXPAND_DLFUNC)
#include <dlfcn.h>
#endif
#include <dlfcn.h>
#endif