projects
/
uffi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r10616: Automated commit for Debian build of uffi upstream-version-1.5.0
[uffi.git]
/
src
/
objects.lisp
diff --git
a/src/objects.lisp
b/src/objects.lisp
index e9a2024112ec409b26c136a3deda65020ba8ca16..cc4a9fef6ca25a06beb7221b6644e496cfd81196 100644
(file)
--- a/
src/objects.lisp
+++ b/
src/objects.lisp
@@
-9,11
+9,8
@@
;;;;
;;;; $Id$
;;;;
;;;;
;;;; $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)
;;;; *************************************************************************
(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
#+(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)
(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
(defmacro ensure-char-storable (obj)
#+(or lispworks (and mcl (not openmcl))) obj