Fix for newer SBCL version

* sql/metaclasses.lisp: Apply one-line patch to fix
  for newer SBCL (thanks to Nikodemus Siivola)

diff --git a/ChangeLog b/ChangeLog
index 6223fd7392a18e3a58853318d59e087f4a759f35..f667115e223b0a792a647e65c9d3ce20abb5409a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-30  Kevin Rosenberg <kevin@rosenberg.net>
+       * sql/metaclasses.lisp: Apply one-line patch to fix
+       for newer SBCL (thanks to Nikodemus Siivola)
+
 2010-10-24  Kevin Rosenberg <kevin@rosenberg.net>
        * Version 5.2.0
        * db-odbc/odbc-api.lisp: Change from SBCL-specific

diff --git a/sql/metaclasses.lisp b/sql/metaclasses.lisp
index 331e35a01966221026571780190544bc492431db..f6bbd3f68369ca2e065741e5abbccb92989893c2 100644 (file)
--- a/sql/metaclasses.lisp
+++ b/sql/metaclasses.lisp
@@ -526,11 +526,12 @@ implementations."
 
          (setf (specified-type esd)
                (delistify-dsd (specified-type dsd)))
-        ;; The type-check-function is computed at defclass expansion,
-        ;; which is too early for the CLSQL type conversion to take
-        ;; place.  This gets rid of it.  It's ugly but it's better
-        ;; than nothing -wcp10/4/10.
-        #+sbcl (setf (slot-value esd 'sb-pcl::%type-check-function) nil)
+         ;; In older SBCL's the type-check-function is computed at
+         ;; defclass expansion, which is too early for the CLSQL type
+         ;; conversion to take place. This gets rid of it. It's ugly
+         ;; but it's better than nothing -wcp10/4/10.
+         #+(and sbcl #.(cl:if (cl:find-symbol "%TYPE-CHECK-FUNCTION" :sb-pcl) '(and) '(or)))
+         (setf (slot-value esd 'sb-pcl::%type-check-function) nil)
 
          )
         ;; all other slots