Merge openssl_disable_ssl2 branch

[users/jgh/exim.git] / src / OS / os.h-Linux

diff --git a/src/OS/os.h-Linux b/src/OS/os.h-Linux
index 14441e684852c0c7580fd4061799c596161836e8..fe4eaa6c76f8c9bed210f1bdaee8b3e38795992a 100644 (file)
--- a/src/OS/os.h-Linux
+++ b/src/OS/os.h-Linux
@@ -1,7 +1,12 @@
-/* $Cambridge: exim/src/OS/os.h-Linux,v 1.6 2007/10/04 13:23:05 tom Exp $ */
-
 /* Exim: OS-specific C header file for Linux */
 
+/* Some old systems we've received bug-reports for have a <limits.h> which
+does not pull in <features.h>.  Best to just pull it in now and have done
+with the issue. */
+
+#include <features.h>
+
+
 #define CRYPT_H
 #define GLIBC_IP_OPTIONS
 #define HAVE_MMAP
@@ -10,10 +15,10 @@
 #define NO_IP_VAR_H
 #define SIG_IGN_WORKS
 
-/* When using the experimental Domainkeys/DKIM extensions, setting
-HAVE_LINUX_SENDFILE can increase performance on outgoing mail a bit.
-Note: With older glibc versions this setting will conflict with the
-_FILE_OFFSET_BITS=64 setting defined as part of the Linux CFLAGS. */
+/* When using the DKIM, setting HAVE_LINUX_SENDFILE can increase
+performance on outgoing mail a bit. Note: With older glibc versions
+this setting will conflict with the _FILE_OFFSET_BITS=64 setting
+defined as part of the Linux CFLAGS. */
 
 /* #define HAVE_LINUX_SENDFILE */
 
@@ -53,8 +58,3 @@ extern struct ip_address_item *os_find_running_interfaces_linux(void);
 #endif /* __linux__ */
 
 /* End */
-
-/* Fudge added because this Linux doesn't appear to have a definition
-for ip_options in /usr/include/linux/ip.h. */
-
-#define ip_options options