From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Wed, 23 Jun 2004 18:37:04 +0000 (+0000)
Subject: r9669: openmcl fix
X-Git-Tag: v1.6.1~96
X-Git-Url: http://git.kpe.io/?p=uffi.git;a=commitdiff_plain;h=f99aed37f09c0d37e3859c1130fd2dc73f125d8c

r9669: openmcl fix
---

diff --git a/debian/changelog b/debian/changelog
index 192408a..4491b29 100644
--- 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 f935e1b..c63d943 100644
--- 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))))
   )