r10830: Automated commit for Debian build of uffi upstream-version-1.5.6

[uffi.git] / src / objects.lisp

diff --git a/src/objects.lisp b/src/objects.lisp
index 6c8a5b651c439e3e4be97a45eaf5d0bc989bff76..33bd042e71048e36dec970f0c78e20a58f5f2386 100644 (file)
--- a/src/objects.lisp
+++ b/src/objects.lisp
@@ -9,11 +9,8 @@
 ;;;;
 ;;;; $Id$
 ;;;;
-;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of UFFI, is Copyright (c) 2002-2005 by Kevin M. Rosenberg
 ;;;;
-;;;; UFFI users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
 (in-package #:uffi)
@@ -245,6 +242,12 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
   '(error "WITH-CAST-POINTER not (yet) implemented for ~A"
           (lisp-implementation-type)))
 
+#+(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))
   (let ((foreign-name (if (atom names) names (first names)))
@@ -258,7 +261,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 (ff:get-entry-point ,(convert-external-name foreign-name))))
     #+lispworks
     `(progn
       (fli:define-foreign-variable (,lisp-name ,foreign-name)
@@ -267,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"