clsql/uffi clsql-uffi.lisp,1.22,1.23

Update of /pubcvs/clsql/uffi
In directory boa.b9.com:/tmp/cvs-serv26342

Modified Files:
	clsql-uffi.lisp 
Log Message:


Index: clsql-uffi.lisp
===================================================================
RCS file: /pubcvs/clsql/uffi/clsql-uffi.lisp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** clsql-uffi.lisp	17 May 2003 07:45:05 -0000	1.22
--- clsql-uffi.lisp	17 May 2003 07:50:55 -0000	1.23
***************
*** 122,128 ****
  	 (t
  	  ;; Choose optimized routine
! 	  #-(or cmu sbcl scl)
  	  (native-to-string char-ptr)
! 	  #+(or cmu sbcl scl)
  	  (uffi:convert-from-foreign-string char-ptr)))))))
    
--- 122,128 ----
  	 (t
  	  ;; Choose optimized routine
! 	  #-(or cmu sbcl lispworks scl)
  	  (native-to-string char-ptr)
! 	  #+(or cmu sbcl lispworks scl)
  	  (uffi:convert-from-foreign-string char-ptr)))))))
    
***************
*** 144,148 ****
        (declare (fixnum i))
        (setf (schar str i)
! 	(code-char (uffi:deref-array s :unsigned-char i)))
        (incf i))
      str))
--- 144,148 ----
        (declare (fixnum i))
        (setf (schar str i)
! 	(code-char (uffi:deref-array s '(:array :unsigned-char) i)))
        (incf i))
      str))
***************
*** 160,164 ****
        (declare (fixnum i))
        (setf (schar str i)
! 	(code-char (uffi:deref-array s :unsigned-char i)))
        (incf i))
      str))
--- 160,164 ----
        (declare (fixnum i))
        (setf (schar str i)
! 	(code-char (uffi:deref-array s '(:array :unsigned-char) i)))
        (incf i))
      str))
***************
*** 177,181 ****
        (declare (fixnum i))
        (setf (aref (the (simple-array (signed-byte 32) (*)) str) i)
! 	(uffi:deref-array s :int i))
  	(incf i))
      (do ((i (* 4 len4)))
--- 177,181 ----
        (declare (fixnum i))
        (setf (aref (the (simple-array (signed-byte 32) (*)) str) i)
! 	(uffi:deref-array s '(:array :int) i))
  	(incf i))
      (do ((i (* 4 len4)))
***************
*** 183,187 ****
        (declare (fixnum i))
        (setf (aref (the (simple-array (signed-byte 8) (*)) str) i)
! 	(uffi:deref-array s :unsigned-char i))
        (incf i))
      str))
--- 183,187 ----
        (declare (fixnum i))
        (setf (aref (the (simple-array (signed-byte 8) (*)) str) i)
! 	(uffi:deref-array s '(:array :unsigned-char) i))
        (incf i))
      str))