- The linux build environment has had some minor improvements - better

  sensing of 64-bit pointer sizes (only used for establishing an icmp_id),
  and corrections to #if operators regarding LINUX_MAJOR should it ever
  move to 3.[01].x. [ISC-Bugs #13115]

diff --git a/RELNOTES b/RELNOTES
index 48ea9e04ea0b2bbb90bcc8d59be9a5db203d5fef..d921702beac942a920a4d14e3a1d051c1ed1a183 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -137,6 +137,11 @@ and for prodding me into improving it.
 - File handlers on configuration state (config files and lease dbs) should
   be treated consistently, regardless of wether TRACING is defined or not.
 
+- The linux build environment has had some minor improvements - better
+  sensing of 64-bit pointer sizes (only used for establishing an icmp_id),
+  and corrections to #if operators regarding LINUX_MAJOR should it ever
+  move to 3.[01].x.
+
                        Changes since 3.0.3b3
 
 - dhclient.conf documentation for interface {} was updated to reflect recent

diff --git a/includes/cf/linux.h b/includes/cf/linux.h
index 6cefbd0e8a8af28a22c3ba87bfc6e77d2210dbed..1028a9ca41ee8664ad9c500b2eada093c94a0315 100644 (file)
--- a/includes/cf/linux.h
+++ b/includes/cf/linux.h
@@ -5,7 +5,7 @@
    Based on a configuration originally supplied by Jonathan Stone. */
 
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2005 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -98,6 +98,11 @@ extern int h_errno;
 
 #define VOIDPTR        void *
 
+#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || \
+       defined(__sparc64__)
+# define PTRSIZE_64BIT
+#endif
+
 #define EOL    '\n'
 
 /* Time stuff... */
@@ -108,7 +113,7 @@ extern int h_errno;
 #define GET_TIME(x)    time ((x))
 
 #if (LINUX_MAJOR >= 2)
-# if (LINUX_MINOR >= 1)
+# if ((LINUX_MAJOR > 2) || (LINUX_MINOR >= 1))
 #  if defined (USE_DEFAULT_NETWORK)
 #   define USE_LPF
 #  endif