projects
/
uffi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r11022: revert incorrect stuff from clisp testing
[uffi.git]
/
src
/
objects.lisp
diff --git
a/src/objects.lisp
b/src/objects.lisp
index 42a5af355344ff179c385eb5fe40fb8ee0702ad7..67c9bcbee0092a814c73a9ccabf24d5553f909ea 100644
(file)
--- a/
src/objects.lisp
+++ b/
src/objects.lisp
@@
-139,8
+139,9
@@
an array of TYPE with size SIZE. The TYPE parameter is evaluated."
`(if (integerp ,obj) ,obj (char-code ,obj)))
(defmacro ensure-char-storable (obj)
`(if (integerp ,obj) ,obj (char-code ,obj)))
(defmacro ensure-char-storable (obj)
- #+(or lispworks digitool) obj
- #+(or allegro cmu sbcl scl openmcl) `(char-code ,obj))
+ #+(or digitool (and lispworks (not lispworks5))) obj
+ #+(or allegro cmu lispworks5 openmcl sbcl scl)
+ `(char-code ,obj))
(defmacro pointer-address (obj)
#+(or cmu scl)
(defmacro pointer-address (obj)
#+(or cmu scl)
@@
-286,5
+287,5
@@
an array of TYPE with size SIZE. The TYPE parameter is evaluated."
;;; macptrs" when a saved image is loaded.
;; This may possibly be needed for sbcl's SAVE-LISP-AND-DIE
(defmacro def-pointer-var (name value &optional doc)
;;; macptrs" when a saved image is loaded.
;; This may possibly be needed for sbcl's SAVE-LISP-AND-DIE
(defmacro def-pointer-var (name value &optional doc)
- #-openmcl `(defvar ,name ,value ,
doc
)
+ #-openmcl `(defvar ,name ,value ,
@(if doc (list doc))
)
#+openmcl `(ccl::defloadvar ,name ,value ,doc))
#+openmcl `(ccl::defloadvar ,name ,value ,doc))