lib/sod.h, src/class-output.lisp: Rename `SOD__CAR' to `SOD_CAR'.

[sod] / src / class-output.lisp

diff --git a/src/class-output.lisp b/src/class-output.lisp
index eb5bc26..8880df5 100644 (file)
--- a/src/class-output.lisp
+++ b/src/class-output.lisp
@@ -98,8 +98,8 @@
         (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 @@
                                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))