Update of /project/mcclim/cvsroot/mcclim/Lisp-Dep In directory clnet:/tmp/cvs-serv5598/Lisp-Dep

Modified Files: fix-clisp.lisp Log Message: For CLISP, the :GRAY package needs to be unlocked at read-time, so use ugly calls to `intern' instead of direct symbols.

--- /project/mcclim/cvsroot/mcclim/Lisp-Dep/fix-clisp.lisp 2004/12/20 15:51:56 1.1 +++ /project/mcclim/cvsroot/mcclim/Lisp-Dep/fix-clisp.lisp 2006/10/28 15:22:25 1.2 @@ -6,15 +6,16 @@ do (export sym :clim-mop)))

;; CLIM expects INPUT-STREAM-P to be a generic function. -(unless (typep #'input-stream-p 'generic-function) - (setf (fdefinition 'gray::original-input-stream-p) #'input-stream-p) - (fmakunbound 'input-stream-p) - (defgeneric input-stream-p (stream) - (:method ((stream stream)) (gray::original-input-stream-p stream)))) +(ext:without-package-lock ("GRAY" "COMMON-LISP") + (unless (typep #'input-stream-p 'generic-function) + (setf (fdefinition (intern "ORIGINAL-INPUT-STREAM-P" (find-package :gray))) #'input-stream-p) + (fmakunbound 'input-stream-p) + (defgeneric input-stream-p (stream) + (:method ((stream stream)) (funcall (fdefinition (intern "ORIGINAL-OUTPUT-STREAM-P" (find-package :gray))) stream))))

-;; CLIM expects OUTPUT-STREAM-P to be a generic function. -(unless (typep #'output-stream-p 'generic-function) - (setf (fdefinition 'gray::original-output-stream-p) #'output-stream-p) - (fmakunbound 'output-stream-p) - (defgeneric output-stream-p (stream) - (:method ((stream stream)) (gray::original-output-stream-p stream)))) + ;; CLIM expects OUTPUT-STREAM-P to be a generic function. + (unless (typep #'output-stream-p 'generic-function) + (setf (fdefinition (intern "ORIGINAL-OUTPUT-STREAM-P" (find-package :gray))) #'output-stream-p) + (fmakunbound 'output-stream-p) + (defgeneric output-stream-p (stream) + (:method ((stream stream)) (funcall (fdefinition (intern "ORIGINAL-OUTPUT-STREAM-P" (find-package :gray))) stream)))))