Updates to support Lispworks 6

diff --git a/ChangeLog b/ChangeLog
index 94e7d471f99895bd66e46072ef8db4e5884740cf..3ceca64638f5ddd4a38c75b6ff1a920b05962e50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
+2010-01-28 Kevin Rosenberg (kevin@rosenberg.net)
+       * Version 1.7.0
+       * src/{functions.lisp,objects.lisp,strings.lisp}: Support Lispworks 6
+

 2007-09-17 Kevin Rosenberg (kevin@rosenberg.net)
 2007-09-17 Kevin Rosenberg (kevin@rosenberg.net)

-       * doc/Makefile, doc/html.xsl: Change output encoding from 
+       * doc/Makefile, doc/html.xsl: Change output encoding from

        ISO-8859-1 to UTF-8
 
 2007-07-22 Kevin Rosenberg (kevin@rosenberg.net)
        ISO-8859-1 to UTF-8
 
 2007-07-22 Kevin Rosenberg (kevin@rosenberg.net)


@@ -12,7 +16,7 @@
        are signaled on failure to load library. This was the case for
        some implementations, change the other implementations to
        match. (Inconsistency found due to Mark Wooding's remarks)
        are signaled on failure to load library. This was the case for
        some implementations, change the other implementations to
        match. (Inconsistency found due to Mark Wooding's remarks)

-       
+

 2007-04-12 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 1.5.18
        * src/functions.lisp: Patch from Ian Eslick for Lispworks 5
 2007-04-12 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 1.5.18
        * src/functions.lisp: Patch from Ian Eslick for Lispworks 5

diff --git a/debian/changelog b/debian/changelog
index 6e028477ef91a56287a233893cb9e28fadc67853..15f153c4982628daaf4c452d5411f7a96d72f83a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-uffi (1.7.0-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Thu, 28 Jan 2010 14:47:42 -0700
+

 cl-uffi (1.6.2-3) unstable; urgency=low
 
   * Build with debhelper extension dh-lisp
 cl-uffi (1.6.2-3) unstable; urgency=low
 
   * Build with debhelper extension dh-lisp

diff --git a/src/functions.lisp b/src/functions.lisp
index e44bc7da087fa3135acb2c3cdf8d3c8927649722..01d62eab7c83546737aca36832ee6b30d278a3cf 100644 (file)
--- a/src/functions.lisp
+++ b/src/functions.lisp
@@ -7,9 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;

-;;;; $Id$
-;;;;
-;;;; This file, part of UFFI, is Copyright (c) 2005 by Kevin M. Rosenberg
+;;;; This file, part of UFFI, is Copyright (c) 2002-2010 by Kevin M. Rosenberg

 ;;;;
 ;;;; *************************************************************************
 
 ;;;;
 ;;;; *************************************************************************
 


@@ -146,7 +144,7 @@
         #+(or cmu scl sbcl)
         `(%def-function ,names ,args
           ,@(if returning (list :returning returning) (values)))
         #+(or cmu scl sbcl)
         `(%def-function ,names ,args
           ,@(if returning (list :returning returning) (values)))

-        #+(and lispworks lispworks5)
+        #+(or lispworks5 lispworks6)

         (multiple-value-bind (name-pair fname lisp-name)
             (preprocess-names names)
           `(progn
         (multiple-value-bind (name-pair fname lisp-name)
             (preprocess-names names)
           `(progn


@@ -161,7 +159,7 @@
                                       ((member (first arg) out :key #'first)
                                        t)))
                           args)))))
                                       ((member (first arg) out :key #'first)
                                        t)))
                           args)))))

-        #+(and lispworks (not lispworks5))
+        #+(and lispworks (not lispworks5) (not lispworks 6))

         `(%def-function ,names ,(convert-lispworks-args args)
           ,@(if module (list :module module) (values))
           ,@(if returning (list :returning returning) (values)))
         `(%def-function ,names ,(convert-lispworks-args args)
           ,@(if module (list :module module) (values))
           ,@(if returning (list :returning returning) (values)))

diff --git a/src/objects.lisp b/src/objects.lisp
index f3beee48b42d93ef617f8dc8befd0b88e09098be..c71a8b106cf96e02f8d479cd124a02ddbfcec661 100644 (file)
--- a/src/objects.lisp
+++ b/src/objects.lisp
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; $Id$
 ;;;;
 ;;;;
 ;;;; $Id$
 ;;;;

-;;;; This file, part of UFFI, is Copyright (c) 2002-2005 by Kevin M. Rosenberg
+;;;; This file, part of UFFI, is Copyright (c) 2002-2010 by Kevin M. Rosenberg

 ;;;;
 ;;;; *************************************************************************
 
 ;;;;
 ;;;; *************************************************************************
 


@@ -139,8 +139,8 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
   `(if (integerp ,obj) ,obj (char-code ,obj)))
 
 (defmacro ensure-char-storable (obj)
   `(if (integerp ,obj) ,obj (char-code ,obj)))
 
 (defmacro ensure-char-storable (obj)

-  #+(or digitool (and lispworks (not lispworks5))) obj
-  #+(or allegro cmu lispworks5 openmcl sbcl scl)
+  #+(or digitool (and lispworks (not lispworks5) (not lispworks6))) obj
+  #+(or allegro cmu lispworks5 lispworks6 openmcl sbcl scl)

   `(char-code ,obj))
 
 (defmacro pointer-address (obj)
   `(char-code ,obj))
 
 (defmacro pointer-address (obj)

diff --git a/src/strings.lisp b/src/strings.lisp
index 543434fe0fed901a0a4d573bca4513d304fa9a51..913b90ab016728a9ee354caeb4e9319d6ded942c 100644 (file)
--- a/src/strings.lisp
+++ b/src/strings.lisp
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; $Id$
 ;;;;
 ;;;;
 ;;;; $Id$
 ;;;;

-;;;; This file, part of UFFI, is Copyright (c) 2002-2005 by Kevin M. Rosenberg
+;;;; This file, part of UFFI, is Copyright (c) 2002-2010 by Kevin M. Rosenberg

 ;;;; *************************************************************************
 
 (in-package #:uffi)
 ;;;; *************************************************************************
 
 (in-package #:uffi)


@@ -389,7 +389,7 @@ that LW/CMU automatically converts strings from c-calls."
 
 (def-type char-ptr-def (* :unsigned-char))
 
 
 (def-type char-ptr-def (* :unsigned-char))
 

-#+(or (and allegro (not ics)) (and lispworks (not lispworks5)))
+#+(or (and allegro (not ics)) (and lispworks (not lispworks5) (not lispworks6)))

 (defun fast-native-to-string (s len)
   (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
            (type char-ptr-def s))
 (defun fast-native-to-string (s len)
   (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
            (type char-ptr-def s))


@@ -402,7 +402,7 @@ that LW/CMU automatically converts strings from c-calls."
       (setf (aref str i)
         (uffi:deref-array s '(:array :char) i)))))
 
       (setf (aref str i)
         (uffi:deref-array s '(:array :char) i)))))
 

-#+(or (and allegro ics) lispworks5)
+#+(or (and allegro ics) lispworks5 lispworks6)

 (defun fast-native-to-string (s len)
   (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
            (type char-ptr-def s))
 (defun fast-native-to-string (s len)
   (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
            (type char-ptr-def s))