1.0.41.26: ppc: Calling-convention fixes for static-fun VOPs.

[sbcl.git] / src / compiler / proclaim.lisp

diff --git a/src/compiler/proclaim.lisp b/src/compiler/proclaim.lisp
index acaa660..ed78315 100644 (file)
--- a/src/compiler/proclaim.lisp
+++ b/src/compiler/proclaim.lisp
@@ -212,10 +212,10 @@
                    (when (type/= type old-type)
                      ;; FIXME: changing to TYPE-PROCLAMATION-MISMATCH
                      ;; broke late-proclaim.lisp.
-                     (style-warn "The new TYPE proclamation~%  ~S~@
-                                  for ~S does not match the old TYPE~@
-                                  proclamation ~S"
-                                 type name old-type))))
+                     (style-warn
+                      "~@<new TYPE proclamation for ~S~@:_  ~S~@:_~
+                        does not match the old TYPE proclamation:~@:_  ~S~@:>"
+                      name (type-specifier type) (type-specifier old-type)))))
                (setf (info :variable :type name) type)
                (setf (info :variable :where-from name) :declared)))
            (push raw-form *queued-proclaims*)))
@@ -233,11 +233,9 @@
                      ;; FIXME: changing to FTYPE-PROCLAMATION-MISMATCH
                      ;; broke late-proclaim.lisp.
                      (style-warn
-                      "new FTYPE proclamation~@
-                       ~S~@
-                       for ~S does not match old FTYPE proclamation~@
-                       ~S"
-                      ctype name old-type))))
+                      "~@<new FTYPE proclamation for ~S~@:_  ~S~@:_~
+                       does not match the old FTYPE proclamation:~@:_  ~S~@:>"
+                      name (type-specifier ctype) (type-specifier old-type)))))
 
                ;; Now references to this function shouldn't be warned
                ;; about as undefined, since even if we haven't seen a