X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fobjects.lisp;h=62f153ee4d659b37ff371c3a499c0fb4e9fef872;hb=30e6dcb79dc5d298d3c9e4f1252d256cc4a08599;hp=26d16728715b99bafdcb983d90300db3ce141cd6;hpb=db166e2970e1aaabd611e243eb899ae4d2f5f5ff;p=uffi.git

diff --git a/src/objects.lisp b/src/objects.lisp
index 26d1672..62f153e 100644
--- a/src/objects.lisp
+++ b/src/objects.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: objects.lisp,v 1.17 2003/08/14 21:40:13 kevin Exp $
+;;;; $Id: objects.lisp,v 1.20 2003/08/23 01:05:53 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -231,20 +231,25 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
 (defmacro def-foreign-var (names type module)
   #-lispworks (declare (ignore module))
   (let ((foreign-name (if (atom names) names (first names)))
-        (lisp-name (if (atom names) (uffi::make-lisp-name names) (second names)))
-        (var-type (uffi::convert-from-uffi-type type :foreign-var)))
+        (lisp-name (if (atom names) (make-lisp-name names) (second names)))
+        #-allegro
+        (var-type (convert-from-uffi-type type :type)))
     #+(or cmu scl)
     `(alien:def-alien-variable (,foreign-name ,lisp-name) ,var-type)
     #+sbcl
     `(sb-alien:define-alien-variable (,foreign-name ,lisp-name) ,var-type)
     #+allegro
-    `(ff:def-foreign-variable (,lisp-name ,foreign-name) :convention :c
-      :type ,var-type)
+    `(define-symbol-macro ,lisp-name
+      (ff:fslot-value-typed (quote ,(convert-from-uffi-type type :deref))
+                            :c (ff:get-entry-point ,foreign-name)))
     #+lispworks
-    (let ((temp-name (gensym)))
-      `(progn
-        (fli:define-foreign-variable (,temp-name ,foreign-name) :type ,var-type :module ,module)
-        (define-symbol-macro ,lisp-name (,temp-name))))
+    `(progn
+      (fli:define-foreign-variable (,lisp-name ,foreign-name)
+                                    :accessor :address-of
+                                    :type ,var-type
+                                    :module ,module)
+      (define-symbol-macro ,lisp-name (fli:dereference (,lisp-name)
+                                                        :copy-foreign-object nil)))
     #-(or allegro cmu scl sbcl lispworks)
     `(define-symbol-macro ,lisp-name
       '(error "DEF-FOREIGN-VAR not (yet) defined for ~A"