Skip to content
Snippets Groups Projects
Commit 335d171c authored by rtoy's avatar rtoy
Browse files

Fix code so it will compile on 8-bit versions. Basically, don't

reference fd-stream-char-to-octets-error and don't call
%make-fd-stream with :char-to-octets-error and :octets-to-char-error
since these don't exist without unicode.
parent 30102669
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain. ;;; Carnegie Mellon University, and has been placed in the public domain.
;;; ;;;
(ext:file-comment (ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fd-stream.lisp,v 1.112 2010/07/05 15:52:47 rtoy Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fd-stream.lisp,v 1.113 2010/07/19 23:41:56 rtoy Exp $")
;;; ;;;
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
...@@ -607,7 +607,7 @@ ...@@ -607,7 +607,7 @@
(setq sap (fd-stream-obuf-sap stream) (setq sap (fd-stream-obuf-sap stream)
tail 0)) tail 0))
(setf (bref sap (1- (incf tail))) byte)) (setf (bref sap (1- (incf tail))) byte))
(fd-stream-char-to-octets-error stream)) #+unicode (fd-stream-char-to-octets-error stream))
(setf (fd-stream-obuf-tail stream) tail)) (setf (fd-stream-obuf-tail stream) tail))
(if (char= char #\Newline) (if (char= char #\Newline)
(setf (fd-stream-char-pos stream) 0) (setf (fd-stream-char-pos stream) 0)
...@@ -722,7 +722,7 @@ ...@@ -722,7 +722,7 @@
(setq sap (fd-stream-obuf-sap stream) (setq sap (fd-stream-obuf-sap stream)
tail 0)) tail 0))
(setf (bref sap (1- (incf tail))) byte)) (setf (bref sap (1- (incf tail))) byte))
(fd-stream-char-to-octets-error stream))) #+unicode (fd-stream-char-to-octets-error stream)))
(setf (fd-stream-obuf-tail stream) tail)))) (setf (fd-stream-obuf-tail stream) tail))))
...@@ -1836,10 +1836,12 @@ ...@@ -1836,10 +1836,12 @@
:pathname pathname :pathname pathname
:buffering buffering :buffering buffering
:timeout timeout) :timeout timeout)
(let ((e (cond ((characterp encoding-error) (let (#+unicode
(e (cond ((characterp encoding-error)
(constantly (char-code encoding-error))) (constantly (char-code encoding-error)))
(t (t
encoding-error))) encoding-error)))
#+unicode
(d (cond ((characterp decoding-error) (d (cond ((characterp decoding-error)
(constantly (char-code decoding-error))) (constantly (char-code decoding-error)))
((eq t decoding-error) ((eq t decoding-error)
...@@ -1858,8 +1860,8 @@ ...@@ -1858,8 +1860,8 @@
:pathname pathname :pathname pathname
:buffering buffering :buffering buffering
:timeout timeout :timeout timeout
:char-to-octets-error e #+unicode :char-to-octets-error #+unicode e
:octets-to-char-error d))))) #+unicode :octets-to-char-error #+unicode d)))))
;; FIXME: setting the external format here should be better ;; FIXME: setting the external format here should be better
;; integrated into set-routines. We do it before so that ;; integrated into set-routines. We do it before so that
;; set-routines can create an in-buffer if appropriate. But we ;; set-routines can create an in-buffer if appropriate. But we
......
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