r10752: 2005-09-17 Kevin Rosenberg (kevin@rosenberg.net)

        * Version 1.5.2
        * src/objects.lisp: prepend _ character for entry
        point on macosx as noted by Luis Oliveira

diff --git a/ChangeLog b/ChangeLog
index dc3ea9afd472f1290d2c228d02590b1bf9b84875..3d6fd1d2e3a6c589bbec3deaf8d5bebc90bb6cfe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-17 Kevin Rosenberg (kevin@rosenberg.net)
+       * Version 1.5.2
+       * src/objects.lisp: prepend _ character for entry
+       point on macosx as noted by Luis Oliveira
+       
 2005-07-05 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 1.5.0
        * Remove vestigial LLGPL license notices as UFFI as been

diff --git a/debian/changelog b/debian/changelog
index 68dfc3af5caa256f609a52270481b75ecabdc604..87943b3b23474b589b00aa09065af3cf68d26ce2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-uffi (1.5.2-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sat, 17 Sep 2005 22:48:11 -0600
+
 cl-uffi (1.5.1-1) unstable; urgency=low
 
   * New upstream

diff --git a/src/objects.lisp b/src/objects.lisp
index cc4a9fef6ca25a06beb7221b6644e496cfd81196..46b72752dcc79b52b0a0f1944ad61eaee63f7ef6 100644 (file)
--- a/src/objects.lisp
+++ b/src/objects.lisp
@@ -242,6 +242,11 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
   '(error "WITH-CAST-POINTER not (yet) implemented for ~A"
           (lisp-implementation-type)))
 
+ (defmacro convert-external-name (name) 
+   "Add an underscore to NAME if necessary for the ABI."
+   #+macosx `(concatenate 'string "_" ,name)
+   #-macosx name)
+
 (defmacro def-foreign-var (names type module)
   #-lispworks (declare (ignore module))
   (let ((foreign-name (if (atom names) names (first names)))
@@ -255,7 +260,7 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
     #+allegro
     `(define-symbol-macro ,lisp-name
       (ff:fslot-value-typed (quote ,(convert-from-uffi-type type :deref))
-                            :c (ff:get-entry-point ,foreign-name)))
+                            :c (convert-external-name (ff:get-entry-point ,foreign-name))))
     #+lispworks
     `(progn
       (fli:define-foreign-variable (,lisp-name ,foreign-name)