X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/blobdiff_plain/0e7cdea08f8c635a46e66bd0a96bb6f12b907bbc..ced609b8c5cc865f25cf5cce91a3d7dc9c85bdee:/src/builtin.lisp

diff --git a/src/builtin.lisp b/src/builtin.lisp
index 1dde0d5..ea72d66 100644
--- a/src/builtin.lisp
+++ b/src/builtin.lisp
@@ -90,8 +90,8 @@ (define-class-slot "imprint" (class stream)
   (format nil "~A__imprint" class)
   (let ((ilayout (sod-class-ilayout class)))
     (format stream "~&~:
-/* Imprint raw memory with instance structure. */
-static void *~A__imprint(void *p)
+/* Imprint raw memory with class `~A' instance structure. */
+static void *~:*~A__imprint(void *p)
 {
   struct ~A *sod__obj = p;
 
@@ -140,9 +140,10 @@ (define-class-slot "init" (class stream)
 			       "  struct ~A *sod__obj = ~A__imprint(p);~2%"
 			       (ilayout-struct-tag class) class)
 		       (setf used t))
-		     (format stream "  {~%    ~A ~A ="
-			     (sod-slot-type dslot)
-			     *sod-tmp-val*)
+		     (format stream "  {~%    ")
+		     (pprint-c-type (sod-slot-type dslot) stream
+				    *sod-tmp-val*)
+		     (format stream " =")
 		     (ecase (sod-initializer-value-kind init)
 		       (:simple (write (sod-initializer-value-form init)
 				       :stream stream