r9326: improve case conversion

[uffi.git] / src / strings.lisp

diff --git a/src/strings.lisp b/src/strings.lisp
index 6e7292cff8e8e89ea4f3a2f4b0a2dc8fb91fe996..0f01e97ba1245103f0c8f8b5affaaa3f0ef019dc 100644 (file)
--- a/src/strings.lisp
+++ b/src/strings.lisp
@@ -188,7 +188,9 @@ that LW/CMU automatically converts strings from c-calls."
   #+mcl
   `(if (ccl:%null-ptr-p ,obj)
      nil
-     (ccl:%get-cstring ,obj 0 ,@(if length (list length) nil)))
+    #+(and mcl (not openmcl)) (ccl:%get-cstring ,obj 0 ,@(if length (list length) nil))
+    #+openmcl (let ((str (ccl:%get-cstring ,obj)))
+               ,(if length '(subseq str 0 length) 'str)))
   )
 
 
@@ -318,10 +320,10 @@ that LW/CMU automatically converts strings from c-calls."
                                    (* length sb-vm:n-byte-bits))
       result)))
 
-
-(def-function "strlen"
-    ((str (* :unsigned-char)))
-  :returning :unsigned-int)
+(eval-when (:compile-toplevel :load-toplevel :execute)
+   (def-function "strlen"
+     ((str (* :unsigned-char)))
+     :returning :unsigned-int))
 
 (def-type char-ptr-def (* :unsigned-char))