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 c04671d84c995ef9ac09ac12d41b51a8d3e8552a..137b47fa2dd66884069e0ffe9de2e52dcd7b007e 100644 (file)
--- 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 99d241bde7f6ec5c9247fc974bc117aa65b37bba..8075eb6e47c9ab0f64bdac5b204566be52ab0e5b 100644 (file)
--- 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 42a5af355344ff179c385eb5fe40fb8ee0702ad7..0e327f0269d4d457da27b457de85fc3657caa5b5 100644 (file)
--- 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 f41113ba416955665ddcb68617c905dca530b85e..ed3f7e820de6cceb90dc02834edb648189a34dbe 100644 (file)
--- 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)))))