From 8d490a4d6b9d7f156cf503826b3e3195e6f3ad39 Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Sat, 7 May 2005 16:12:06 +0000 Subject: [PATCH] 0.9.0.25: Build fixes ... only complain about unknown external formats on character streams; ... with-fixed-allocation bodies on x86 (and probably x86-64) --- src/code/fd-stream.lisp | 20 ++++++++++---------- src/compiler/x86-64/alloc.lisp | 4 ++-- src/compiler/x86/alloc.lisp | 4 ++-- version.lisp-expr | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/code/fd-stream.lisp b/src/code/fd-stream.lisp index 2ef71e6..37a8a44 100644 --- a/src/code/fd-stream.lisp +++ b/src/code/fd-stream.lisp @@ -1348,16 +1348,16 @@ (function c-string int)) sb!unix:codeset) "LATIN-1") - "KEYWORD"))) - (dolist (entry *external-formats* - (restart-case - (error "Invalid external-format ~A" - (fd-stream-external-format fd-stream)) - (use-default () - :report "Set external format to LATIN-1" - (setf (fd-stream-external-format fd-stream) :latin-1)))) - (when (member (fd-stream-external-format fd-stream) (first entry)) - (return))) + "KEYWORD")) + (dolist (entry *external-formats* + (restart-case + (error "Invalid external-format ~A" + (fd-stream-external-format fd-stream)) + (use-default () + :report "Set external format to LATIN-1" + (setf (fd-stream-external-format fd-stream) :latin-1)))) + (when (member (fd-stream-external-format fd-stream) (first entry)) + (return)))) (when input-p (multiple-value-bind (routine type size read-n-characters diff --git a/src/compiler/x86-64/alloc.lisp b/src/compiler/x86-64/alloc.lisp index 1e53f95..cf91584 100644 --- a/src/compiler/x86-64/alloc.lisp +++ b/src/compiler/x86-64/alloc.lisp @@ -133,8 +133,8 @@ (:node-var node) (:generator 10 (with-fixed-allocation - (result value-cell-header-widetag value-cell-size node)) - (storew value result value-cell-value-slot other-pointer-lowtag))) + (result value-cell-header-widetag value-cell-size node) + (storew value result value-cell-value-slot other-pointer-lowtag)))) ;;;; automatic allocators for primitive objects diff --git a/src/compiler/x86/alloc.lisp b/src/compiler/x86/alloc.lisp index 4d2a18d..8d96fcb 100644 --- a/src/compiler/x86/alloc.lisp +++ b/src/compiler/x86/alloc.lisp @@ -226,8 +226,8 @@ (:node-var node) (:generator 10 (with-fixed-allocation - (result value-cell-header-widetag value-cell-size node)) - (storew value result value-cell-value-slot other-pointer-lowtag))) + (result value-cell-header-widetag value-cell-size node) + (storew value result value-cell-value-slot other-pointer-lowtag)))) ;;;; automatic allocators for primitive objects diff --git a/version.lisp-expr b/version.lisp-expr index 3a331bd..068b216 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.9.0.24" +"0.9.0.25" -- 1.7.10.4