X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdefstruct.lisp;h=ae83f975482072eb4a07fd3be14fc46efc27756b;hb=245101f127d61e28b9c864c720eb17973469a904;hp=e4f0119f580310887c918856170e575e4a91d719;hpb=860543cc7ba0266e41e1d41ac9b6a208f3795f1a;p=sbcl.git

diff --git a/src/code/defstruct.lisp b/src/code/defstruct.lisp
index e4f0119..ae83f97 100644
--- a/src/code/defstruct.lisp
+++ b/src/code/defstruct.lisp
@@ -1442,17 +1442,26 @@
     (unless (or defaults boas)
       (push (symbolicate "MAKE-" (dd-name defstruct)) defaults))
 
-    (collect ((res))
+    (collect ((res) (names))
       (when defaults
-	(let ((cname (first defaults)))
-	  (setf (dd-default-constructor defstruct) cname)
-	  (res (create-keyword-constructor defstruct creator))
-	  (dolist (other-name (rest defaults))
-	    (res `(setf (fdefinition ',other-name) (fdefinition ',cname)))
-	    (res `(declaim (ftype function ',other-name))))))
+        (let ((cname (first defaults)))
+          (setf (dd-default-constructor defstruct) cname)
+          (res (create-keyword-constructor defstruct creator))
+          (names cname)
+          (dolist (other-name (rest defaults))
+            (res `(setf (fdefinition ',other-name) (fdefinition ',cname)))
+            (names other-name))))
 
       (dolist (boa boas)
-	(res (create-boa-constructor defstruct boa creator)))
+        (res (create-boa-constructor defstruct boa creator))
+        (names (first boa)))
+
+      (res `(declaim (ftype
+                      (sfunction *
+                                 ,(if (eq (dd-type defstruct) 'structure)
+                                      (dd-name defstruct)
+                                      '*))
+                      ,@(names))))
 
       (res))))