From f222dcf60ffe3fcfb03709698d3c282c27ae946f Mon Sep 17 00:00:00 2001 From: Brian Mastenbrook Date: Fri, 7 Nov 2008 15:01:36 +0000 Subject: [PATCH] 1.0.22.17: fix cross-compile from CMUCL 19e --- src/compiler/constraint.lisp | 8 ++++---- version.lisp-expr | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/compiler/constraint.lisp b/src/compiler/constraint.lisp index 1052d8c11..41990276c 100644 --- a/src/compiler/constraint.lisp +++ b/src/compiler/constraint.lisp @@ -136,8 +136,8 @@ ;; from the following declarations. Probably you'll want to ;; disable these declarations when debugging consets. (declare #-sb-xc-host (optimize (speed 3) (safety 0) (space 0))) - (declaim (inline constraint-number)) - (defun constraint-number (constraint) + (declaim (inline %constraint-number)) + (defun %constraint-number (constraint) (sset-element-number constraint)) (defstruct (conset (:constructor make-conset ()) @@ -222,7 +222,7 @@ (values)) (defun conset-member (constraint conset) - (let ((number (constraint-number constraint)) + (let ((number (%constraint-number constraint)) (vector (conset-vector conset))) (when (< number (length vector)) (plusp (sbit vector number))))) @@ -230,7 +230,7 @@ (defun conset-adjoin (constraint conset) (prog1 (not (conset-member constraint conset)) - (let ((number (constraint-number constraint))) + (let ((number (%constraint-number constraint))) (conset-grow conset (1+ number)) (setf (sbit (conset-vector conset) number) 1) (setf (conset-min conset) (min number (or (conset-min conset) diff --git a/version.lisp-expr b/version.lisp-expr index 512b57458..d68a864c3 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".) -"1.0.22.16" +"1.0.22.17" -- 2.11.4.GIT