X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdefbangconstant.lisp;h=9c5d0e7662afa203a798cea49b73ba889c852023;hb=4898ef32c639b1c7f4ee13a5ba566ce6debd03e6;hp=fefa23a131a9bd49a91ba06f03e1debea661ad57;hpb=79cc569a97e444389350ea3f5b1017374fe16bec;p=sbcl.git diff --git a/src/code/defbangconstant.lisp b/src/code/defbangconstant.lisp index fefa23a..9c5d0e7 100644 --- a/src/code/defbangconstant.lisp +++ b/src/code/defbangconstant.lisp @@ -29,12 +29,12 @@ (defconstant ,@(cdr whole)) #+sb-xc-host ,(unless (eql (find-symbol (symbol-name name) :cl) name) - `(defconstant ,@(cdr whole))) - #+sb-xc-host + `(defconstant ,@(cdr whole))) + #+sb-xc-host ,(let ((form `(sb!xc:defconstant ,@(cdr whole)))) - (if (boundp '*delayed-def!constants*) - `(push ',form *delayed-def!constants*) - form)))) + (if (boundp '*delayed-def!constants*) + `(push ',form *delayed-def!constants*) + form)))) ;;; machinery to implement DEF!CONSTANT delays #+sb-xc-host @@ -44,12 +44,12 @@ (/show "done binding *DELAYED-DEF!CONSTANTS*") (defun force-delayed-def!constants () (if (boundp '*delayed-def!constants*) - (progn - (mapc #'eval *delayed-def!constants*) - (makunbound '*delayed-def!constants*)) - ;; This condition is probably harmless if it comes up when - ;; interactively experimenting with the system by loading a - ;; source file into it more than once. But it's worth warning - ;; about it because it definitely shouldn't come up in an - ;; ordinary build process. - (warn "*DELAYED-DEF!CONSTANTS* is already unbound.")))) + (progn + (mapc #'eval *delayed-def!constants*) + (makunbound '*delayed-def!constants*)) + ;; This condition is probably harmless if it comes up when + ;; interactively experimenting with the system by loading a + ;; source file into it more than once. But it's worth warning + ;; about it because it definitely shouldn't come up in an + ;; ordinary build process. + (warn "*DELAYED-DEF!CONSTANTS* is already unbound."))))