From: Nikodemus Siivola <nikodemus@random-state.net>
Date: Sat, 3 Jan 2009 16:10:19 +0000 (+0000)
Subject: 1.0.24.15: contrib fixes for HPPA
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=cfc48ce6a2013804d35217f2b4f93f290ea8465b;p=sbcl.git

1.0.24.15: contrib fixes for HPPA

 * Fix or disable what breaks in contribs, so not everything breaks.

 * Patch by Larry Valkama.
---

diff --git a/contrib/sb-bsd-sockets/constants.lisp b/contrib/sb-bsd-sockets/constants.lisp
index 7badaf7..95d8e39 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,14 +78,14 @@
  (: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")
diff --git a/contrib/sb-posix/posix-tests.lisp b/contrib/sb-posix/posix-tests.lisp
index 272209f..bbd6dd5 100644
--- a/contrib/sb-posix/posix-tests.lisp
+++ b/contrib/sb-posix/posix-tests.lisp
@@ -405,6 +405,7 @@
         (ignore-errors (sb-posix:unlink name))))
   nil)
 
+#-hpux ; fix: cant handle c-vargs
 (deftest open.error.1
   (handler-case (sb-posix:open *test-directory* sb-posix::o-wronly)
     (sb-posix:syscall-error (c)
@@ -428,7 +429,7 @@
                   sb-posix::o-nonblock)))
   t)
 
-#-win32
+#-(or hpux win32) ; fix: cant handle c-vargs
 (deftest fcntl.flock.1
     (locally (declare (sb-ext:muffle-conditions sb-ext:compiler-note))
       (let ((flock (make-instance 'sb-posix:flock
@@ -643,6 +644,7 @@
   ;; Same thing, but with a very long link target (which doesn't have
   ;; to exist).  This tests the array adjustment in the wrapper,
   ;; provided that the target's length is long enough.
+  #-hpux ; arg2 to readlink is 80, and arg0 is larger than that
   (deftest readlink.2
       (let ((target-pathname (make-pathname
                               :name (make-string 255 :initial-element #\a)
@@ -765,7 +767,7 @@
           (delete-file temp))))
   t "mkstemp-1")
 
-#-(or win32 sunos)
+#-(or win32 sunos hpux)
 ;;; mkdtemp is unimplemented on at least Solaris 10
 (deftest mkdtemp.1
     (let ((pathname
diff --git a/version.lisp-expr b/version.lisp-expr
index c25fc50..de2f387 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.24.14"
+"1.0.24.15"