X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcross-misc.lisp;h=eb57e41b34ae4341aaa651116d15cf611afa9a66;hb=860543cc7ba0266e41e1d41ac9b6a208f3795f1a;hp=c44584adb989e4d95aa4583b4ca7d4baf6611bc7;hpb=a40c4adfd7837230109cdb1f054b44fe0b15371a;p=sbcl.git

diff --git a/src/code/cross-misc.lisp b/src/code/cross-misc.lisp
index c44584a..eb57e41 100644
--- a/src/code/cross-misc.lisp
+++ b/src/code/cross-misc.lisp
@@ -41,10 +41,10 @@
 (defvar *after-gc-hooks* nil)
 
 ;;; The GENESIS function works with fasl code which would, in the
-;;; target SBCL, work on LISP-STREAMs. A true LISP-STREAM doesn't seem
-;;; to be a meaningful concept in ANSI Common Lisp, but we can fake it
-;;; acceptably well using a standard STREAM.
-(deftype lisp-stream () 'stream)
+;;; target SBCL, work on ANSI-STREAMs (streams which aren't extended
+;;; Gray streams). In ANSI Common Lisp, an ANSI-STREAM is just a
+;;; CL:STREAM.
+(deftype ansi-stream () 'stream)
 
 ;;; In the target SBCL, the INSTANCE type refers to a base
 ;;; implementation for compound types. There's no way to express
@@ -68,12 +68,13 @@
     nil))
 
 ;;; This seems to be the portable Common Lisp type test which
-;;; corresponds to the effect of the target SBCL implementation test..
+;;; corresponds to the effect of the target SBCL implementation test...
 (defun sb!kernel:array-header-p (x)
-  (and (typep x 'simple-array)
-       (= 1 (array-rank x))))
+  (and (typep x 'array)
+       (or (not (typep x 'simple-array))
+	   (/= (array-rank x) 1))))
 
-;;; Genesis needs these at cross-compile time. The target
+;;; GENESIS needs these at cross-compile time. The target
 ;;; implementation of these is reasonably efficient by virtue of its
 ;;; ability to peek into the internals of the package implementation;
 ;;; this reimplementation is portable but slow.
@@ -97,7 +98,7 @@
   (let ((result 0))
     (declare (type fixnum result))
     (do-external-symbols (i package)
-      (declare (ignore i))
+      (declare (ignorable i))
       (incf result))
     result))