X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fobjects.cl;h=b510b35bcd47f9627f0b1d46445c389d9bb85797;hb=379a7c3e7b8249ace498d8733c87a3f575a7c799;hp=6a33f9b1cc04a9b145e6c27924ad13ddbef7d4e0;hpb=2ac8c217068f8d2a1255df83c741370f0add8a4d;p=uffi.git

diff --git a/src/objects.cl b/src/objects.cl
index 6a33f9b..b510b35 100644
--- a/src/objects.cl
+++ b/src/objects.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: objects.cl,v 1.13 2002/03/21 16:47:46 kevin Exp $
+;;;; $Id: objects.cl,v 1.14 2002/03/22 20:51:08 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -107,20 +107,20 @@ an array of TYPE with size SIZE."
   obj
   )
 
-;; Simple first pass. Will later create optimized routines for
-;; various platforms.
 (defmacro with-foreign-object ((var type) &rest body)
-  #+allegro
+  #-(or cmu lispworks) ; default version
   `(let ((,var (allocate-foreign-object ,type)))
     (unwind-protect
 	 (progn ,@body)
       (free-foreign-object ,var)))
   #+cmu
-  `(alien:with-alien ((,var ,(convert-from-uffi-type type :allocate)))
-    (setq ,var (alien:addr ,var))
-    ,@body)
+  (let ((obj (gensym)))
+    `(alien:with-alien ((,obj ,(convert-from-uffi-type type :allocate)))
+       (let ((,var (alien:addr ,obj)))
+	 ,@body)))
   #+lispworks
-  `(fli:with-dynamic-foreign-objects ((,var ,(convert-from-uffi-type type :allocate)))
+  `(fli:with-dynamic-foreign-objects ((,var ,(convert-from-uffi-type
+					      type :allocate)))
     ,@body)
   )