From: Cyrus Harmon <ch-sbcl@bobobeach.com>
Date: Sat, 3 Mar 2007 20:53:15 +0000 (+0000)
Subject: 1.0.3.25: freebsd sb-bsd-sockets fixes
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=b3893d0b3c852b0b535ba6ecd9d66a5f92308c09;p=sbcl.git

1.0.3.25: freebsd sb-bsd-sockets fixes
 * SO_NO_CHECK doesn't exist on freebsd. Make this #-freebsd.
 * EAI-ADDRFAMILY and EAI-NODATA are deprecated and don't exist on
   freebsd. Make these #-freebsd.
---

diff --git a/contrib/sb-bsd-sockets/constants.lisp b/contrib/sb-bsd-sockets/constants.lisp
index 96d11a1..5cd6f72 100644
--- a/contrib/sb-bsd-sockets/constants.lisp
+++ b/contrib/sb-bsd-sockets/constants.lisp
@@ -47,6 +47,7 @@
            "Send periodic keepalives: if peer does not respond, we get SIGPIPE")
  (:integer so-oobinline "SO_OOBINLINE"
            "Put out-of-band data into the normal input queue when received")
+ #-freebsd
  (:integer so-no-check "SO_NO_CHECK")
  #+linux (:integer so-priority "SO_PRIORITY")
  (:integer so-linger "SO_LINGER"
@@ -273,7 +274,9 @@
  (:integer EAI-BADFLAGS "EAI_BADFLAGS")
  (:integer EAI-NONAME "EAI_NONAME")
  (:integer EAI-SERVICE "EAI_SERVICE")
+ #-freebsd
  (:integer EAI-ADDRFAMILY "EAI_ADDRFAMILY")
+ #-freebsd
  (:integer EAI-NODATA "EAI_NODATA")
  (:integer EAI-MEMORY "EAI_MEMORY")
  (:integer EAI-FAIL "EAI_FAIL")
diff --git a/contrib/sb-bsd-sockets/name-service.lisp b/contrib/sb-bsd-sockets/name-service.lisp
index dfa826b..f375562 100644
--- a/contrib/sb-bsd-sockets/name-service.lisp
+++ b/contrib/sb-bsd-sockets/name-service.lisp
@@ -222,7 +222,7 @@ GET-NAME-SERVICE-ERRNO")
     no-recovery-error)
 (define-name-service-condition
     sockint::NO-ADDRESS  ;; Also defined as NO-DATA, with the same value
-    sockint::EAI-NODATA
+    #-freebsd sockint::EAI-NODATA #+freebsd nil
     no-address-error)
 
 (defun condition-for-name-service-errno (err)
diff --git a/version.lisp-expr b/version.lisp-expr
index 7f3f2b3..3f1e1d8 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.3.24"
+"1.0.3.25"