From: William Harold Newman <william.newman@airmail.net>
Date: Sun, 26 Sep 2004 22:37:34 +0000 (+0000)
Subject: 0.8.14.29:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=ccc4a55f3f70219a45b0038d8442615e5abff494;p=sbcl.git

0.8.14.29:
	merged Brian Mastenbrook's fix for SBCL build on OS X
	broke some long lines (turning 1-liner into slightly
	  nontrivial-looking patch, alas)
---

diff --git a/contrib/sb-posix/macros.lisp b/contrib/sb-posix/macros.lisp
index 5cfa2e9..cd722e3 100644
--- a/contrib/sb-posix/macros.lisp
+++ b/contrib/sb-posix/macros.lisp
@@ -46,8 +46,10 @@
 (defun lisp-for-c-symbol (s)
   (intern (substitute #\- #\_ (string-upcase s)) :sb-posix))
 
-(defmacro define-call-internally (lisp-name c-name return-type error-predicate &rest arguments)
-  (if (sb-sys:foreign-symbol-address-as-integer-or-nil c-name)
+(defmacro define-call-internally (lisp-name c-name return-type error-predicate
+				  &rest arguments)
+  (if (sb-sys:foreign-symbol-address-as-integer-or-nil
+       (sb-vm:extern-alien-name c-name))
       `(progn
 	(declaim (inline ,lisp-name))
 	(defun ,lisp-name ,(mapcar #'car arguments)
@@ -57,11 +59,16 @@
 		     (function ,return-type
 			       ,@(mapcar
 				  (lambda (x)
-				    (gethash (cadr x) *designator-types* (cadr x)))
+				    (gethash (cadr x)
+					     *designator-types*
+					     (cadr x)))
 				  arguments)))
 		    ,@(mapcar (lambda (x)
-				(if (nth-value 1 (gethash (cadr x) *designator-types*))
-				    `(,(intern (symbol-name (cadr x)) :sb-posix)
+				(if (nth-value 1
+					       (gethash (cadr x)
+							*designator-types*))
+				    `(,(intern (symbol-name (cadr x))
+					       :sb-posix)
 				      ,(car x))
 				    (car x)))
 			      arguments))))
@@ -72,7 +79,11 @@
   (let ((lisp-name (lisp-for-c-symbol name)))
     `(progn
        (export ',lisp-name :sb-posix)
-       (define-call-internally ,lisp-name ,name ,return-type ,error-predicate ,@arguments))))
+       (define-call-internally ,lisp-name
+	   ,name
+	 ,return-type
+	 ,error-predicate
+	 ,@arguments))))
 
 (defmacro define-entry-point (name arglist &body body)
   (let ((lisp-name (lisp-for-c-symbol name)))
diff --git a/version.lisp-expr b/version.lisp-expr
index 2a1dfd8..0973086 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".)
-"0.8.14.28"
+"0.8.14.29"