X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fobjects.lisp;h=cc4a9fef6ca25a06beb7221b6644e496cfd81196;hb=042f48cf5bfac1823816425d17472b362798e4fe;hp=e9a2024112ec409b26c136a3deda65020ba8ca16;hpb=09464c82191ef241c749756bbad5ffaadd8f6e5f;p=uffi.git diff --git a/src/objects.lisp b/src/objects.lisp index e9a2024..cc4a9fe 100644 --- 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) @@ -132,12 +129,14 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated." #+(or (and mcl (not openmcl))) obj #+(or allegro cmu sbcl scl openmcl) `(code-char ,obj) ;; lispworks varies whether deref'ing array vs. slot access of a char - #+lispworks - `(if (characterp ,obj) ,obj (code-char ,obj))) + #+lispworks `(if (characterp ,obj) ,obj (code-char ,obj))) (defmacro ensure-char-integer (obj) #+(or (and mcl (not openmcl))) `(char-code ,obj) - #+(or allegro cmu sbcl scl openmcl) obj) + #+(or allegro cmu sbcl scl openmcl) obj + ;; lispworks varies whether deref'ing array vs. slot access of a char + #+lispworks + `(if (integerp ,obj) ,obj (char-code ,obj))) (defmacro ensure-char-storable (obj) #+(or lispworks (and mcl (not openmcl))) obj