X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-bsd-sockets%2Fconstants.lisp;h=2b131f2fb611df9a7a5380d9a52a5ce80f368a42;hb=7c75cd363da90afe334e936aad2b63437ea5905d;hp=5cd6f722271ccb062279a6192e1a838c69d004e0;hpb=b3893d0b3c852b0b535ba6ecd9d66a5f92308c09;p=sbcl.git

diff --git a/contrib/sb-bsd-sockets/constants.lisp b/contrib/sb-bsd-sockets/constants.lisp
index 5cd6f72..2b131f2 100644
--- a/contrib/sb-bsd-sockets/constants.lisp
+++ b/contrib/sb-bsd-sockets/constants.lisp
@@ -12,8 +12,8 @@
 ((:integer af-inet "AF_INET" "IP Protocol family")
  (:integer af-unspec "AF_UNSPEC" "Unspecified")
  (:integer af-local
-           #+(or sunos solaris) "AF_UNIX"
-           #-(or sunos solaris) "AF_LOCAL"
+           #+(or sunos solaris hpux) "AF_UNIX"
+           #-(or sunos solaris hpux) "AF_LOCAL"
            "Local to host (pipes and file-domain).")
  #+linux (:integer af-inet6 "AF_INET6"   "IP version 6")
  #+linux (:integer af-route "AF_NETLINK" "Alias to emulate 4.4BSD ")
@@ -78,20 +78,19 @@
  (:integer ENETUNREACH "ENETUNREACH")
  (:integer ENOTCONN "ENOTCONN")
 
- (:integer NETDB-INTERNAL "NETDB_INTERNAL" "See errno.")
- (:integer NETDB-SUCCESS "NETDB_SUCCESS" "No problem.")
+ (:integer NETDB-INTERNAL #+hpux "h_NETDB_INTERNAL" #-hpux "NETDB_INTERNAL" "See errno.")
+ (:integer NETDB-SUCCESS #+hpux "h_NETDB_SUCCESS" #-hpux "NETDB_SUCCESS" "No problem.")
  (:integer HOST-NOT-FOUND "HOST_NOT_FOUND" "Authoritative Answer Host not found.")
  (:integer TRY-AGAIN "TRY_AGAIN" "Non-Authoritative Host not found, or SERVERFAIL.")
  (:integer NO-RECOVERY "NO_RECOVERY" "Non recoverable errors, FORMERR, REFUSED, NOTIMP.")
  (:integer NO-DATA "NO_DATA" "Valid name, no data record of requested type.")
  (:integer NO-ADDRESS "NO_ADDRESS" "No address, look for MX record.")
- (:function h-strerror ("hstrerror" c-string (errno int)))
+ #-hpux (:function h-strerror ("hstrerror" c-string (errno int)))
 
  (:integer O-NONBLOCK "O_NONBLOCK")
  (:integer f-getfl "F_GETFL")
  (:integer f-setfl "F_SETFL")
 
- #+linux (:integer msg-nosignal "MSG_NOSIGNAL")
  (:integer msg-oob "MSG_OOB")
  (:integer msg-peek "MSG_PEEK")
  (:integer msg-trunc "MSG_TRUNC")
@@ -130,6 +129,7 @@
  (:structure in-addr ("struct in_addr"
                       ((array (unsigned 8)) addr "u_int32_t" "s_addr")))
  (:structure sockaddr-in ("struct sockaddr_in"
+                          #+darwin ((unsigned 8) len "__uint8_t" "sin_len")
                           (integer family "sa_family_t" "sin_family")
                           ;; These two could be in-port-t and
                           ;; in-addr-t, but then we'd throw away the
@@ -140,6 +140,9 @@
  (:structure sockaddr-un ("struct sockaddr_un"
                           (integer family "sa_family_t" "sun_family")
                           (c-string path "char" "sun_path")))
+ (:structure sockaddr-un-abstract ("struct sockaddr_un"
+                              (integer family "sa_family_t" "sun_family")
+                              ((array (unsigned 8)) path "char" "sun_path")))
  (:structure hostent ("struct hostent"
                       (c-string-pointer name "char *" "h_name")
                       ((* c-string) aliases "char **" "h_aliases")
@@ -211,6 +214,10 @@
                                (msg (* msghdr))
                                (flags int)))
  (:function gethostbyname ("gethostbyname" (* hostent) (name c-string)))
+ #+darwin
+ (:function gethostbyname2 ("gethostbyname2" (* hostent)
+                                             (name c-string)
+                                             (af int)))
  (:function gethostbyaddr ("gethostbyaddr" (* hostent)
                                            (addr (* t))
                                            (len int)
@@ -235,7 +242,14 @@
                        (integer family "int" "ai_family")
                        (integer socktype "int" "ai_socktype")
                        (integer protocol "int" "ai_protocol")
-                       (integer addrlen "size_t""ai_addrlen")
+                       ;; CLH 20070306 FIXME: ai_addrlen should really
+                       ;; be a socklen_t, but I'm not sure if this the
+                       ;; case on other platforms. I'm setting this to
+                       ;; socklen_t on darwin and hoping that other
+                       ;; platform maintainers will do the right thing
+                       ;; here.
+                       #+darwin (integer addrlen "socklen_t" "ai_addrlen")
+                       #-darwin (integer addrlen "size_t" "ai_addrlen")
                        ((* sockaddr-in) addr "struct sockaddr*" "ai_addr")
                        (c-string canonname "char *" "ai_canonname")
                        ((* t) next "struct addrinfo*" "ai_next")))
@@ -276,8 +290,6 @@
  (: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")
  (:integer EAI-AGAIN "EAI_AGAIN")
@@ -302,5 +314,5 @@
                         (level int)
                         (optname int)
                         (optval (* t))
-                        (optlen (* int))))) ;;; should be socklen-t!
-)
+                        (optlen (* int)))) ;;; should be socklen-t!
+ )