r4950: *** empty log message ***

[clsql.git] / uffi / clsql-uffi.lisp

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index 11fb988c6358269588418cd98105c1232a11db0d..aa75cf1df3313108d71059085d313abf9115bb9b 100644 (file)
--- a/uffi/clsql-uffi.lisp
+++ b/uffi/clsql-uffi.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: clsql-uffi.lisp,v 1.6 2003/05/15 07:33:21 kevin Exp $
+;;;; $Id: clsql-uffi.lisp,v 1.8 2003/05/15 07:45:17 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -120,8 +120,10 @@
                  low32
                  (make-64-bit-integer high32 low32)))))
         (t
+         ;; Choose optimized routine
+         #-(or cmu sbcl)
          (native-to-string char-ptr)
-         #+ignore
+         #+(or cmu sbcl)
          (uffi:convert-from-foreign-string char-ptr)))))))
   
 
@@ -130,7 +132,8 @@
   :returning :unsigned-int)
 
 (defun native-to-string (s)
-  (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0)))
+  (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
+          (type char-ptr-def s))
   (let* ((len (strlen s))
         (str (make-string len)))
     (declare (fixnum len)