From: Ted Lemon <source@isc.org>
Date: Sat, 5 Feb 2000 17:40:18 +0000 (+0000)
Subject: Define SOCKLEN_T for old versions of O.S. that don't have socklen_t.
X-Git-Tag: V3-BETA-2-PATCH-1~328
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=488b9286c5b00dd76db6de823da1456a984c1680;p=thirdparty%2Fdhcp.git

Define SOCKLEN_T for old versions of O.S. that don't have socklen_t.
---

diff --git a/includes/cf/freebsd.h b/includes/cf/freebsd.h
index 47752c20e..c9e637fc2 100644
--- a/includes/cf/freebsd.h
+++ b/includes/cf/freebsd.h
@@ -72,6 +72,16 @@ extern int h_errno;
 
 #define HAVE_SA_LEN
 
+/* socklen_t was first defined on November 24 in sys/socket.h, and
+   __FreeBSD_version was changed to 400013 on December 4, so if you
+   get a compile error on this, and you updated between those dates,
+   that's why.   Also, it may be that some 3.x version after 3.4 will
+   have socklen_t, but no such change has been made so far. */
+
+#if  __FreeBSD_version < 400013
+#define SOCKLEN_T int
+#endif
+
 #if defined (USE_DEFAULT_NETWORK)
 #  define USE_BPF
 #endif
diff --git a/includes/cf/netbsd.h b/includes/cf/netbsd.h
index 117378667..7a0b49fd3 100644
--- a/includes/cf/netbsd.h
+++ b/includes/cf/netbsd.h
@@ -80,6 +80,11 @@ extern int h_errno;
 #define PTRSIZE_64BIT
 #endif
 
+/* NetBSD added socklen_t in 1.3J, just prior to the 1.4 release. */
+#if __NetBSD_Version__ > 103090000
+#define SOCKLEN_T int
+#endif
+
 #ifdef NEED_PRAND_CONF
 /* prand_conf.h goop - remove when BIND 9 comes around. */
 #ifndef HAVE_DEV_RANDOM
diff --git a/includes/cf/openbsd.h b/includes/cf/openbsd.h
index 5e855b89d..9adeb1987 100644
--- a/includes/cf/openbsd.h
+++ b/includes/cf/openbsd.h
@@ -80,6 +80,11 @@ extern int h_errno;
 #define PTRSIZE_64BIT
 #endif
 
+/* socklen_t first used right around the time 2.5 branched, it looks like. */
+#if OpenBSD < 199905
+#define SOCKLEN_T int
+#endif
+
 #ifdef NEED_PRAND_CONF
 #ifndef HAVE_DEV_RANDOM
  # define HAVE_DEV_RANDOM 1