From f28952dfbbc69735b835a429131f2384eee7e9d0 Mon Sep 17 00:00:00 2001
Message-Id: <f28952dfbbc69735b835a429131f2384eee7e9d0.1714153369.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Wed, 29 Feb 2012 17:40:24 +0000
Subject: [PATCH] Make type-expand-based code work on SBCL again.
Organization: Straylight/Edgeware

From: Rupert Swarbrick <rswarbrick@gmail.com>

See the (ancient) post at
http://permalink.gmane.org/gmane.lisp.clg.devel/427 for an
explanation.
---
 gffi/interface.lisp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gffi/interface.lisp b/gffi/interface.lisp
index d89e9a7..72e3c13 100644
--- a/gffi/interface.lisp
+++ b/gffi/interface.lisp
@@ -424,6 +424,12 @@   (deftype callback () 'symbol))
 
 ;;;; Type expansion
 
+;; A hack to make the TYPE-EXPAND code for SBCL work.
+#?+(pkg-config:sbcl>= 1 0 35 15)
+(sb-ext:without-package-locks
+  (setf (symbol-function 'sb-kernel::type-expand)
+        (lambda (form) (typexpand form))))
+
 (defun type-expand-1 (form)
   #+(or cmu sbcl)
   (let ((def (cond ((symbolp form)
-- 
[mdw]