X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/blobdiff_plain/c2438e62e7c3cf1b7006522cef61e8c6f797600b..1344e1f9c923a4d6602d64a33da175f48c7b7b64:/src/class-output.lisp

diff --git a/src/class-output.lisp b/src/class-output.lisp
index eb5bc26..8880df5 100644
--- a/src/class-output.lisp
+++ b/src/class-output.lisp
@@ -98,8 +98,8 @@ (defmethod hook-output progn ((class sod-class) (reason (eql :h)) sequencer)
 	 (format stream "/* Conversion macros. */~%")
 	 (dolist (super (cdr (sod-class-precedence-list class)))
 	   (let ((super-head (sod-class-chain-head super)))
-	     (format stream "#define ~:@(~A__CONV_~A~)(p) ((~A *)~
-				     ~:[SOD_XCHAIN(~A, (p))~;(p)~])~%"
+	     (format stream "#define ~:@(~A__CONV_~A~)(_obj) ((~A *)~
+				     ~:[SOD_XCHAIN(~A, (_obj))~;(_obj)~])~%"
 		     class (sod-class-nickname super) super
 		     (eq chain-head super-head)
 		     (sod-class-nickname super-head))))
@@ -138,7 +138,7 @@ (defmethod hook-output progn ((class sod-class) (reason (eql :h)) sequencer)
 				raw-name)))
 		 (cond ((and (cdr args) (eq (cadr args) :ellipsis))
 			(setf varargsp t)
-			(unless in-names (setf me "SOD__CAR(__VA_ARGS__)"))
+			(unless in-names (setf me "SOD_CAR(__VA_ARGS__)"))
 			(push (format nil "/*~A*/ ..." name) in-names)
 			(push "__VA_ARGS__" out-names)
 			(return))