Skip to content
Snippets Groups Projects
Commit fbced7f5 authored by Raymond Toy's avatar Raymond Toy
Browse files

Fix so this can build on 8-bit cmucl.

o Clean up reader conditionals in MAKE-FD-STREAM.
o Add dummy %SET-FD-STREAM-EXTERNAL-FORMAT for non-unicode.
parent 38b90775
No related branches found
No related tags found
No related merge requests found
......@@ -2136,6 +2136,12 @@
;;;; Creation routines (MAKE-FD-STREAM and OPEN)
;; The unicode version of this is in fd-stream-extfmt.lisp
#-(and unicode (not unicode-boootstrap))
(defun %set-fd-stream-external-format (stream extfmt &optional (updatep t))
(declare (ignore stream extfmt updatep))
(values))
;;; MAKE-FD-STREAM -- Public.
;;;
;;; Returns a FD-STREAM on the given file.
......@@ -2246,15 +2252,12 @@
;; external format.
;;
;;#-unicode-bootstrap ; fails in stream-reinit otherwise
#+(and unicode (not unicode-bootstrap))
(cond ((and (eq external-format :file-attribute) input)
;; Read the encoding file option with the external-format set to
;; :iso8859-1, and then change the external-format if necessary.
#+(and unicode (not unicode-bootstrap))
(%set-fd-stream-external-format stream :iso8859-1 nil)
(set-routines stream element-type input output input-buffer-p
:binary-stream-p binary-stream-p)
#+(and unicode (not unicode-bootstrap))
(%set-fd-stream-external-format stream :iso8859-1 nil)
(multiple-value-bind (encoding eol-mode)
(stream-encoding-file-attribute stream)
......@@ -2271,18 +2274,14 @@
((eq external-format :file-attribute)
;; Non-input stream, so can not read the file attributes, so use the
;; :default.
#+(and unicode (not unicode-bootstrap))
(%set-fd-stream-external-format stream :default nil)
(set-routines stream element-type input output input-buffer-p
:binary-stream-p binary-stream-p)
#+(and unicode (not unicode-bootstrap))
(%set-fd-stream-external-format stream :default nil))
(t
#+(and unicode (not unicode-bootstrap))
(%set-fd-stream-external-format stream external-format nil)
(set-routines stream element-type input output input-buffer-p
:binary-stream-p binary-stream-p)
#+(and unicode (not unicode-bootstrap))
(%set-fd-stream-external-format stream external-format nil)))
stream))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment