r9669: openmcl fix

diff --git a/debian/changelog b/debian/changelog
index 192408aa8be9f5b868652e4be58a119f3f0cdee1..4491b296fe4f0986a86ab65a6cd2d2474cca4937 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-uffi (1.4.22-1) unstable; urgency=low
+
+  * OpenMCL fix
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Wed, 23 Jun 2004 12:36:24 -0600
+
 cl-uffi (1.4.21-1) unstable; urgency=low
 
   * Fix for WITH-FOREIGN-OBJECT macro on CMUCL

diff --git a/src/strings.lisp b/src/strings.lisp
index f935e1bd479db0b479068a6e812432dbfebe44d9..c63d943e2c8e3496fb89056de87df03bb722bab1 100644 (file)
--- a/src/strings.lisp
+++ b/src/strings.lisp
@@ -190,8 +190,9 @@ that LW/CMU automatically converts strings from c-calls."
   `(if (ccl:%null-ptr-p ,obj)
      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)))
+    #+openmcl ,@(if length
+                   `((ccl:%str-from-ptr ,obj ,length))
+                   `((ccl:%get-cstring ,obj))))
   )