projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r5003: *** empty log message ***
[clsql.git]
/
uffi
/
clsql-uffi.lisp
diff --git
a/uffi/clsql-uffi.lisp
b/uffi/clsql-uffi.lisp
index a6d4af4da61c779dd82932474cc4a374a0d575b6..7bc3a94c55678c8d2a7af65f579f493c429bd1f9 100644
(file)
--- a/
uffi/clsql-uffi.lisp
+++ b/
uffi/clsql-uffi.lisp
@@
-7,7
+7,7
@@
;;;; Programmers: Kevin M. Rosenberg
;;;; Date Started: Mar 2002
;;;;
;;;; Programmers: Kevin M. Rosenberg
;;;; Date Started: Mar 2002
;;;;
-;;;; $Id: clsql-uffi.lisp,v 1.2
2 2003/05/17 07:45:0
5 kevin Exp $
+;;;; $Id: clsql-uffi.lisp,v 1.2
3 2003/05/17 07:50:5
5 kevin Exp $
;;;;
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
;;;;
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
@@
-121,9
+121,9
@@
(make-64-bit-integer high32 low32)))))
(t
;; Choose optimized routine
(make-64-bit-integer high32 low32)))))
(t
;; Choose optimized routine
- #-(or cmu sbcl scl)
+ #-(or cmu sbcl
lispworks
scl)
(native-to-string char-ptr)
(native-to-string char-ptr)
- #+(or cmu sbcl scl)
+ #+(or cmu sbcl
lispworks
scl)
(uffi:convert-from-foreign-string char-ptr)))))))
(uffi:convert-from-foreign-string char-ptr)))))))
@@
-143,7
+143,7
@@
((= i len))
(declare (fixnum i))
(setf (schar str i)
((= i len))
(declare (fixnum i))
(setf (schar str i)
- (code-char (uffi:deref-array s
:unsigned-char
i)))
+ (code-char (uffi:deref-array s
'(:array :unsigned-char)
i)))
(incf i))
str))
(incf i))
str))
@@
-159,7
+159,7
@@
((= i len))
(declare (fixnum i))
(setf (schar str i)
((= i len))
(declare (fixnum i))
(setf (schar str i)
- (code-char (uffi:deref-array s
:unsigned-char
i)))
+ (code-char (uffi:deref-array s
'(:array :unsigned-char)
i)))
(incf i))
str))
(incf i))
str))
@@
-176,13
+176,13
@@
((= i len4))
(declare (fixnum i))
(setf (aref (the (simple-array (signed-byte 32) (*)) str) i)
((= i len4))
(declare (fixnum i))
(setf (aref (the (simple-array (signed-byte 32) (*)) str) i)
- (uffi:deref-array s
:int
i))
+ (uffi:deref-array s
'(:array :int)
i))
(incf i))
(do ((i (* 4 len4)))
((= i len))
(declare (fixnum i))
(setf (aref (the (simple-array (signed-byte 8) (*)) str) i)
(incf i))
(do ((i (* 4 len4)))
((= i len))
(declare (fixnum i))
(setf (aref (the (simple-array (signed-byte 8) (*)) str) i)
- (uffi:deref-array s
:unsigned-char
i))
+ (uffi:deref-array s
'(:array :unsigned-char)
i))
(incf i))
str))
(incf i))
str))