[movitz-devel] SBCL build fixes

[Nyef]

Hello all.

Attached is a patch that prevents building on SBCL from erroring
out with complaints about constants being redefined with uneql
values.

--Alastair Bridgewater

-------------- next part --------------
Index: image.lisp
===================================================================
RCS file: /project/movitz/cvsroot/movitz/image.lisp,v
retrieving revision 1.2
diff -u -r1.2 image.lisp
--- image.lisp	15 Jan 2004 17:36:19 -0000	1.2
+++ image.lisp	16 Jan 2004 19:09:08 -0000
@@ -686,7 +686,9 @@
   (#+allegro excl:tenuring #-allegro progn
 	     (psetq *image* (let ((*image* (make-movitz-image start-address)))
 			      (when init-file
-				(movitz-compile-file init-file))
+				#+sbcl(handler-bind ((sb-ext:defconstant-uneql #'continue))
+						    (movitz-compile-file init-file))
+				#-sbcl(movitz-compile-file init-file))
 			      *image*)
 		    *i* (when (boundp '*image*) *image*))
 	     ;; #+acl (excl:gc)
Index: load.lisp
===================================================================
RCS file: /project/movitz/cvsroot/movitz/load.lisp,v
retrieving revision 1.5
diff -u -r1.5 load.lisp
--- load.lisp	16 Jan 2004 18:22:37 -0000	1.5
+++ load.lisp	16 Jan 2004 19:09:08 -0000
@@ -47,7 +47,10 @@
 			    (do () (nil)
 			      (with-simple-restart (retry "Retry loading ~S" path)
 				(return
-				  (load (compile-file (make-pathname :name path :type "lisp")
+				 #+sbcl (handler-bind ((sb-ext:defconstant-uneql #'continue))
+						      (load (compile-file (make-pathname :name path :type "lisp")
+									  :print nil)))
+				  #-sbcl(load (compile-file (make-pathname :name path :type "lisp")
 						      :print nil))))))
 			  '("packages"
 			    "movitz"