r10754: Automated commit for Debian build of uffi upstream-version-1.5.3

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

diff --git a/src/objects.lisp b/src/objects.lisp
index 46b72752dcc79b52b0a0f1944ad61eaee63f7ef6..b7c27157480bdcf1d3757b96de0386bec62d84db 100644 (file)
--- a/src/objects.lisp
+++ b/src/objects.lisp
@@ -242,9 +242,9 @@ 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) 
+ (defun convert-external-name (name) 
    "Add an underscore to NAME if necessary for the ABI."
-   #+macosx `(concatenate 'string "_" ,name)
+   #+macosx (concatenate 'string "_" name)
    #-macosx name)
 
 (defmacro def-foreign-var (names type module)
@@ -260,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 (convert-external-name (ff:get-entry-point ,foreign-name))))
+                            :c (ff:get-entry-point ,(convert-external-name foreign-name))))
     #+lispworks
     `(progn
       (fli:define-foreign-variable (,lisp-name ,foreign-name)