Skip to content
Snippets Groups Projects
Commit 1142016d authored by Kevin Rosenberg's avatar Kevin Rosenberg
Browse files

fix conflicts

parents 373a64e9 bfcfbf0f
No related branches found
No related tags found
No related merge requests found
28 Jun 2008 Kevin Rosenberg <kevin@rosenberg.net>
* Version 1.96
28 Jan 2008 Kevin Rosenberg <kevin@rosenberg.net>
* Version 1.98
* {datetime,strings,tests}.lisp: Add remove-char-string
18 Sep 2007 Kevin Rosenberg <kevin@rosenberg.net>
* Version 1.97
* datetime.lisp: Improve output format for date-string
10 Sep 2007 Kevin Rosenberg <kevin@rosenberg.net>
* Version 1.96
* byte-stream.lisp: Use without-package-locks as suggested
by Daniel Gackle.
01 Jun 2007 Kevin Rosenberg <kevin@rosenberg.net>
* Version 1.95
* {datetime,package}.lisp: Add day-of-week and pretty-date-ut
......
......@@ -241,21 +241,22 @@ Make-Byte-Array-Output-Stream since the last call to this function."
(replace result (slot-value stream 'excl::buffer))
result))
(defmethod excl:device-extend ((stream extendable-buffer-output-stream)
need action)
(declare (ignore action))
(let* ((len (file-position stream))
(new-len (max (+ len need) (* 2 len)))
(old-buf (slot-value stream 'excl::buffer))
(new-buf (make-array new-len :element-type '(unsigned-byte 8))))
(declare (fixnum len)
(optimize (speed 3) (safety 0)))
(dotimes (i len)
(setf (aref new-buf i) (aref old-buf i)))
(setf (slot-value stream 'excl::buffer) new-buf)
(setf (slot-value stream 'excl::buffer-ptr) new-len)
)
t)
(excl::without-package-locks
(defmethod excl:device-extend ((stream extendable-buffer-output-stream)
need action)
(declare (ignore action))
(let* ((len (file-position stream))
(new-len (max (+ len need) (* 2 len)))
(old-buf (slot-value stream 'excl::buffer))
(new-buf (make-array new-len :element-type '(unsigned-byte 8))))
(declare (fixnum len)
(optimize (speed 3) (safety 0)))
(dotimes (i len)
(setf (aref new-buf i) (aref old-buf i)))
(setf (slot-value stream 'excl::buffer) new-buf)
(setf (slot-value stream 'excl::buffer-ptr) new-len)
)
t))
)
......
......@@ -45,7 +45,7 @@
(multiple-value-bind (sec min hr day mon year dow daylight-p zone)
(decode-universal-time ut)
(declare (ignore daylight-p zone))
(format nil "~[Mon~;Tue~;Wed~;Thu~;Fri~;Sat~;Sun~], ~d ~[Jan~;Feb~;Mar~;Apr~;May~;Jun~;Jul~;Aug~;Sep~;Oct~;Nov~;Dec~] ~d ~2,'0d:~2,'0d:~2,'0d"
(format nil "~[Mon~;Tue~;Wed~;Thu~;Fri~;Sat~;Sun~] ~d ~[Jan~;Feb~;Mar~;Apr~;May~;Jun~;Jul~;Aug~;Sep~;Oct~;Nov~;Dec~] ~d ~2,'0d:~2,'0d:~2,'0d"
dow
day
(1- mon)
......
cl-kmrcl (1.97-1) unstable; urgency=low
* New upstream
-- Kevin M. Rosenberg <kmr@debian.org> Tue, 18 Sep 2007 23:54:44 -0600
cl-kmrcl (1.96-1) unstable; urgency=low
* New upstream
-- Kevin M. Rosenberg <kmr@debian.org> Mon, 10 Sep 2007 18:18:11 -0600
cl-kmrcl (1.95-1) unstable; urgency=low
* New upstream
......
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