Changes required by SBCL 0.9.10

diff --git a/glib/glib.asd b/glib/glib.asd
index 5c18f0bfeeabecfc428c5d0da5d66bd1145c1976..f6fd3e793b43aa0770c64de21ed62edd7e58e7b3 100644 (file)
--- a/glib/glib.asd
+++ b/glib/glib.asd
@@ -27,8 +27,24 @@
   (push :glib2.8 *features*))
 
 #+sbcl
-(when (string>= (lisp-implementation-version) "0.9.8")
-  (push :sbcl>=0.9.8 *features*))
+(progn
+  (defun sbcl-version ()
+    (let ((dot1 (position #\. (lisp-implementation-version)))
+         (dot2 (position #\. (lisp-implementation-version) :from-end t)))
+      (values 
+       (parse-integer (lisp-implementation-version) :end dot1)
+       (parse-integer (lisp-implementation-version) :start (1+ dot1) :end dot2)
+       (parse-integer (lisp-implementation-version) :start (1+ dot2)))))
+  (defun sbcl-version>= (req-major req-minor req-micro)
+    (multiple-value-bind (major minor micro) (sbcl-version)      
+      (or 
+       (> major req-major)
+       (and (= major req-major) (> minor req-minor))
+       (and (= major req-major) (= minor req-minor) (>= micro req-micro)))))
+  (when (sbcl-version>= 0 9 8)
+    (push :sbcl>=0.9.8 *features*))
+  (when (sbcl-version>= 0 9 10)
+    (push :sbcl>=0.9.10 *features*)))
 
 #+(and sbcl (not alien-callbacks))
 (eval-when (:compile-toplevel :load-toplevel :execute)

diff --git a/glib/proxy.lisp b/glib/proxy.lisp
index bd74e77f5d0cd6d8caae0a7fac86e9517d62e6ca..f43b8069ecb5067b4f39acd2acc4ebb1d89c53c1 100644 (file)
--- a/glib/proxy.lisp
+++ b/glib/proxy.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: proxy.lisp,v 1.38 2006-03-03 10:01:47 espen Exp $
+;; $Id: proxy.lisp,v 1.39 2006-03-06 14:28:03 espen Exp $
 
 (in-package "GLIB")
 
@@ -211,8 +211,9 @@ (defmethod compute-effective-slot-definition-initargs ((class virtual-slots-clas
        (let ((boundp (most-specific-slot-value direct-slotds 'boundp)))
         (unless (eq boundp *unbound-marker*)
           (setf (getf initargs :boundp) boundp)))
-       ;; Need this to prevent type expansion in SBCL >= 0.9.8
-       (let ((type (most-specific-slot-value direct-slotds 'type)))
+       ;; This is needed to avoid type expansion in SBCL version >= 0.9.8
+       #+sbcl>=0.9.8
+       (let ((type (most-specific-slot-value direct-slotds #-sbcl>=0.9.10'type #+sbcl>=0.9.10'sb-pcl::%type)))
         (unless (eq type *unbound-marker*)
           (setf (getf initargs :type) type)))
        (nconc initargs (call-next-method))))