Index: /trunk/ccl/level-1/l1-streams.lisp
===================================================================
--- /trunk/ccl/level-1/l1-streams.lisp	(revision 5023)
+++ /trunk/ccl/level-1/l1-streams.lisp	(revision 5024)
@@ -1302,5 +1302,5 @@
   )
 
-(defmethod stream-read-line ((s fundamental-character-input-stream))
+(defmethod stream-read-line ((s character-input-stream))
   (generic-read-line s))
 
@@ -1452,5 +1452,5 @@
 
 (make-built-in-class 'basic-input-stream 'basic-stream 'input-stream)
-(make-built-in-class 'basic-output-stream 'basic-stream 'input-stream)
+(make-built-in-class 'basic-output-stream 'basic-stream 'output-stream)
 (make-built-in-class 'basic-io-stream 'basic-input-stream 'basic-output-stream)
 (make-built-in-class 'basic-character-input-stream 'basic-input-stream 'basic-character-stream 'character-input-stream)
@@ -1579,4 +1579,10 @@
         (%ioblock-character-read-vector ioblock vector start end)))))
 
+(defmethod stream-read-line ((stream basic-character-input-stream))
+  (let* ((ioblock (basic-stream-ioblock stream)))
+    (with-ioblock-input-locked (ioblock)
+      (%ioblock-read-line ioblock))))
+
+                             
 ;;; Synonym streams.