From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Wed, 5 Jul 2006 01:24:51 +0000 (+0000)
Subject: r10965: 2006-07-04 Kevin Rosenberg (kevin@rosenberg.net)
X-Git-Tag: v1.6.1~22
X-Git-Url: http://git.kpe.io/?p=uffi.git;a=commitdiff_plain;h=6b108d27ffc3f4e08f2529e71911ed02a5310a6d

r10965: 2006-07-04 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 1.5.14
        * src/{objects,strings}.lisp: Apply patch from Edi Weitz
---

diff --git a/ChangeLog b/ChangeLog
index c04671d..137b47f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-04 Kevin Rosenberg (kevin@rosenberg.net)
+	* Version 1.5.14
+	* src/{objects,strings}.lisp: Apply patch from Edi Weitz
+
 2006-05-17 Kevin Rosenberg (kevin@rosenberg.net)
 	* Version 1.5.13 
 	* src/libraries.lisp: Revert buggy patch from Yaroslav Kavenchuk.
diff --git a/debian/changelog b/debian/changelog
index 99d241b..8075eb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-uffi (1.5.14-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Tue,  4 Jul 2006 19:23:10 -0600
+
 cl-uffi (1.5.13-1) unstable; urgency=low
 
   * New upstream
diff --git a/src/objects.lisp b/src/objects.lisp
index 42a5af3..0e327f0 100644
--- a/src/objects.lisp
+++ b/src/objects.lisp
@@ -286,5 +286,5 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
 ;;; macptrs" when a saved image is loaded.
 ;; This may possibly be needed for sbcl's SAVE-LISP-AND-DIE
 (defmacro def-pointer-var (name value &optional doc)
-  #-openmcl `(defvar ,name ,value ,doc)
+  #-openmcl `(defvar ,name ,value ,@(if doc (list doc)))
   #+openmcl `(ccl::defloadvar ,name ,value ,doc))
diff --git a/src/strings.lisp b/src/strings.lisp
index f41113b..ed3f7e8 100644
--- a/src/strings.lisp
+++ b/src/strings.lisp
@@ -396,7 +396,8 @@ that LW/CMU automatically converts strings from c-calls."
   (let* ((len (or len (strlen s)))
          (str (make-string len)))
     (declare (fixnum len)
-	     (type (simple-array (signed-byte 8) (*)) str))
+	     (type (simple-array #+lispworks base-char
+                                 #-lispworks (signed-byte 8) (*)) str))
     (dotimes (i len str)
       (setf (aref str i)
 	(uffi:deref-array s '(:array :char) i)))))