0.6.11.17:

[sbcl.git] / src / code / load.lisp

diff --git a/src/code/load.lisp b/src/code/load.lisp
index 24341c3..098933e 100644 (file)
--- 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$")
 \f
 ;;;; 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 ~D, but we need version ~D.~:@>"
                            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