Ignore:
Timestamp:
Jun 6, 2009, 8:23:20 PM (11 years ago)
Author:
gz
Message:

Merge r11483 r11817 r11979 r11980 r12166 from trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/working-0711/ccl/level-1/l1-streams.lisp

    r12048 r12213  
    191191
    192192
    193 (defloadvar *heap-ivectors* ())
     193(defstatic *heap-ivectors* ())
    194194(defvar *heap-ivector-lock* (make-lock))
    195195
     
    26182618
    26192619(defun %locked-ioblock-write-char-translating-newline-to-cr (ioblock char)
    2620   (with-ioblock-input-lock-grabbed (ioblock)
     2620  (with-ioblock-output-lock-grabbed (ioblock)
    26212621    (%ioblock-write-char-translating-newline-to-cr ioblock char)))
    26222622
     
    26382638
    26392639(defun %locked-ioblock-write-char-translating-newline-to-crlf (ioblock char)
    2640   (with-ioblock-input-lock-grabbed (ioblock)
     2640  (with-ioblock-output-lock-grabbed (ioblock)
    26412641    (%ioblock-write-char-translating-newline-to-crlf ioblock char)))
    26422642
     
    26532653
    26542654(defun %locked-ioblock-write-char-translating-newline-to-line-separator (ioblock char)
    2655   (with-ioblock-input-lock-grabbed (ioblock)
     2655  (with-ioblock-output-lock-grabbed (ioblock)
    26562656    (%ioblock-write-char-translating-newline-to-line-separator ioblock char)))
    26572657
     
    28652865                          (:lock
    28662866                           '%locked-ioblock-read-char-translating-line-separator-to-newline)
    2867                           (t '%ioblock-read-char-translating-line-separator-to-newline))))))))
     2867                          (t '%ioblock-read-char-translating-line-separator-to-newline)))))
     2868      (setf (ioblock-line-termination ioblock) line-termination))))
    28682869 
    28692870(defun setup-ioblock-output (ioblock character-p element-type sharing encoding line-termination)
     
    30483049                          (:lock
    30493050                           '%locked-ioblock-write-char-translating-newline-to-line-separator)
    3050                           (t '%ioblock-write-char-translating-newline-to-line-separator))))))))
     3051                          (t '%ioblock-write-char-translating-newline-to-line-separator)))))
     3052      (setf (ioblock-line-termination ioblock) line-termination))))
    30513053
    30523054
Note: See TracChangeset for help on using the changeset viewer.