r3459: some bug fixes

diff --git a/src/objects.lisp b/src/objects.lisp
index eca0c8f57403f485a3094fee64885482a5e7bff6..6c7a745476fea1939bb2e1b7d957d44980a57438 100644 (file)
--- 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.5 2002/11/14 22:11:07 kevin Exp $
+;;;; $Id: objects.lisp,v 1.6 2002/11/23 18:01:57 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -108,8 +108,8 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
   #+(or cmu scl)  `(alien:deref ,ptr)
   #+sbcl  `(sb-alien:deref ,ptr)
   #+lispworks `(fli:dereference ,ptr)
-  #+allegro `(ff:fslot-value-typed ,(convert-from-uffi-type type :deref) :c ,ptr)
-  #+mcl `(ccl:pref ,ptr ,(convert-from-uffi-type type :deref))
+  #+allegro `(ff:fslot-value-typed (convert-from-uffi-type ,type :deref) :c ,ptr)
+  #+mcl `(ccl:pref ,ptr (convert-from-uffi-type ,type :deref))
   )
 
 #+mcl

diff --git a/src/primitives.lisp b/src/primitives.lisp
index dc91044d8cead83512ae03def4157a43fa98f23c..8ba2ba67e02217f17e417f94faef0c43f4662987 100644 (file)
--- a/src/primitives.lisp
+++ b/src/primitives.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: primitives.lisp,v 1.5 2002/10/16 11:56:43 kevin Exp $
+;;;; $Id: primitives.lisp,v 1.6 2002/11/23 18:01:57 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -166,7 +166,7 @@ supports takes advantage of this optimization."
       (:pointer-void . (* :void))
       (:cstring . (* :unsigned-char))
       (:byte . :char)
-      (:unsigned-byte . :unsigned-byte)
+      (:unsigned-byte . :unsigned-char)
       (:char . :char)
       (:unsigned-char . :unsigned-char)
       (:int . :int) (:unsigned-int . :unsigned-int)