r10756: fix allegro osx patch

diff --git a/ChangeLog b/ChangeLog
index 3d6fd1d2e3a6c589bbec3deaf8d5bebc90bb6cfe..d9a6410c5b50f5f71fb653b84fe9bec46a04f801 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2005-09-17 Kevin Rosenberg (kevin@rosenberg.net)
 2005-09-17 Kevin Rosenberg (kevin@rosenberg.net)

-       * Version 1.5.2
+       * Version 1.5.4

        * src/objects.lisp: prepend _ character for entry
        * src/objects.lisp: prepend _ character for entry

-       point on macosx as noted by Luis Oliveira
+       point on Allegro macosx, patch by Luis Oliveira

        
 2005-07-05 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 1.5.0
        
 2005-07-05 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 1.5.0

diff --git a/debian/changelog b/debian/changelog
index f117bcd262053de0e86795562b70321fae2089c4..b9afaf94542cbd2c53f996f3bc9bdcbbfd22ea93 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-uffi (1.5.4-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sun, 18 Sep 2005 01:22:50 -0600
+

 cl-uffi (1.5.3-1) unstable; urgency=low
 
   * New upstream
 cl-uffi (1.5.3-1) unstable; urgency=low
 
   * New upstream

diff --git a/src/objects.lisp b/src/objects.lisp
index b7c27157480bdcf1d3757b96de0386bec62d84db..33bd042e71048e36dec970f0c78e20a58f5f2386 100644 (file)
--- a/src/objects.lisp
+++ b/src/objects.lisp
@@ -242,10 +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)))
 
   '(error "WITH-CAST-POINTER not (yet) implemented for ~A"
           (lisp-implementation-type)))
 

- (defun convert-external-name (name) 
-   "Add an underscore to NAME if necessary for the ABI."
-   #+macosx (concatenate 'string "_" name)
-   #-macosx name)
+#+(or allegro openmcl)
+(defun convert-external-name (name) 
+  "Add an underscore to NAME if necessary for the ABI."
+  #+(or macosx darwinppc-target) (concatenate 'string "_" name)
+  #-(or macosx darwinppc-target) name)

 
 (defmacro def-foreign-var (names type module)
   #-lispworks (declare (ignore module))
 
 (defmacro def-foreign-var (names type module)
   #-lispworks (declare (ignore module))


@@ -269,11 +270,10 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
                                     :module ,module)
       (define-symbol-macro ,lisp-name (fli:dereference (,lisp-name)
                                                         :copy-foreign-object nil)))
                                     :module ,module)
       (define-symbol-macro ,lisp-name (fli:dereference (,lisp-name)
                                                         :copy-foreign-object nil)))

-    #+(and openmcl darwinppc-target)
-    (setf foreign-name (concatenate 'string "_" foreign-name))

     #+openmcl
     `(define-symbol-macro ,lisp-name
     #+openmcl
     `(define-symbol-macro ,lisp-name

-       (deref-pointer (ccl:foreign-symbol-address ,foreign-name) ,var-type))
+       (deref-pointer (ccl:foreign-symbol-address
+                       ,(convert-external-name foreign-name)) ,var-type))

     #-(or allegro cmu scl sbcl lispworks openmcl)
     `(define-symbol-macro ,lisp-name
       '(error "DEF-FOREIGN-VAR not (yet) defined for ~A"
     #-(or allegro cmu scl sbcl lispworks openmcl)
     `(define-symbol-macro ,lisp-name
       '(error "DEF-FOREIGN-VAR not (yet) defined for ~A"