From 57f05907b2f071c1d3aed0676ce8ea2f5d4e4854 Mon Sep 17 00:00:00 2001 From: Kevin Layer <layer@franz.com> Date: Mon, 23 May 2011 17:15:12 -0700 Subject: [PATCH] The 'stream' package is no more. I removed references to stream:, which should be OK since those symbols are in the excl: package and we use that package. This change should work on all supported versions of ACL. Change-Id: I354f252a5527ecd927642acb6f5723dc83e8c8e0 --- clim/interactive-protocol.lisp | 9 +++------ utils/packages.lisp | 5 ++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/clim/interactive-protocol.lisp b/clim/interactive-protocol.lisp index 1fe7476b..3f0c7696 100644 --- a/clim/interactive-protocol.lisp +++ b/clim/interactive-protocol.lisp @@ -1128,24 +1128,21 @@ "") accept-args))) -(defmethod #-(or aclpc acl86win32) stream:stream-yes-or-no-p - #+(or aclpc acl86win32) stream-yes-or-no-p +(defmethod stream-yes-or-no-p ((stream input-protocol-mixin) &optional format-string &rest args) (stream-yay-or-nay-p stream '(member-alist (("Yes" :value t) ("No" :value nil))) format-string args)) -(defmethod #-(or aclpc acl86win32) stream:stream-y-or-n-p - #+(or aclpc acl86win32) stream-y-or-n-p +(defmethod stream-y-or-n-p ((stream input-protocol-mixin) &optional format-string &rest args) (stream-yay-or-nay-p stream '(member-alist (("Y" :value t) ("N" :value nil))) format-string args)) -(defmethod #-(or aclpc acl86win32) excl::stream-y-or-n-or-newline-p - #+(or aclpc acl86win32) stream-y-or-n-or-newline-p +(defmethod stream-y-or-n-or-newline-p ((stream input-protocol-mixin) &optional format-string &rest args) (stream-yay-or-nay-p stream '(member-alist (("Y" :value t) ("N" :value nil))) diff --git a/utils/packages.lisp b/utils/packages.lisp index 157f0f60..94477622 100644 --- a/utils/packages.lisp +++ b/utils/packages.lisp @@ -30,7 +30,10 @@ #+allegro (:implementation-packages :clim-lisp :clim-utils) ;; 28Jan97 added allegro package for aclpc since mop stuff was moved ;; there in 3.0.1 -tjm - (:use common-lisp #+allegro clos #+allegro stream #+aclpc allegro) + (:use common-lisp #+allegro clos + #+(and (version>= 9 0) allegro) excl + #-(and (version>= 9 0) allegro) stream + #+aclpc allegro) ;; Import these symbols so that we can define methods for them. (:shadow pathname truename) -- GitLab