X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fload.lisp;h=75fe074cd68083501f916fdd5e37b8206650cd41;hb=b8f63d9b4e978bec3bfc1f4fc471e5ed946781fd;hp=24341c337e28327681cb8394f1db916c543a6bc3;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git diff --git a/src/code/load.lisp b/src/code/load.lisp index 24341c3..75fe074 100644 --- a/src/code/load.lisp +++ b/src/code/load.lisp @@ -15,9 +15,6 @@ ;;;; files for more information. (in-package "SB!IMPL") - -(file-comment - "$Header$") ;;;; variables @@ -294,18 +291,21 @@ ;; could probably be shared with the read-a-keyword fop. (version (read-arg 4))) (declare (ignore ignore)) - (flet ((check-version (impl vers) - (when (string= impl implementation) - (unless (= version vers) - (error "~S was compiled for fasl file format version ~S, ~ - but we need version ~S." + (flet ((check-version (variant possible-implementation needed-version) + (when (string= possible-implementation implementation) + (unless (= version needed-version) + (error "~S was compiled for ~A fasl file format version ~ + ~S, but we need version ~S." stream + variant version - vers)) + needed-version)) t))) - (or (check-version #.sb!c:*backend-fasl-file-implementation* + (or (check-version "native code" + #.sb!c:*backend-fasl-file-implementation* #.sb!c:*backend-fasl-file-version*) - (check-version #.(sb!c:backend-byte-fasl-file-implementation) + (check-version "byte code" + #.(sb!c:backend-byte-fasl-file-implementation) sb!c:byte-fasl-file-version) (error "~S was compiled for implementation ~A, but this is a ~A." stream