r10756: fix allegro osx patch

[uffi.git] / src / objects.lisp

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)))
 
- (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))
@@ -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)))
-    #+(and openmcl darwinppc-target)
-    (setf foreign-name (concatenate 'string "_" foreign-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"