From 061c44b0289f52a5a895bbb26d1aca49e1488edb Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 30 Aug 2015 10:58:38 +0100
Subject: [PATCH] lib/sod.h, src/class-output.lisp: Rename `SOD__CAR' to
 `SOD_CAR'.

---
 lib/sod.h             | 4 ++--
 src/class-output.lisp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/sod.h b/lib/sod.h
index 8270895..af34d5d 100644
--- a/lib/sod.h
+++ b/lib/sod.h
@@ -124,7 +124,7 @@ struct sod_chain {
   ((struct cls##__ilayout *)						\
    ((char *)(obj) - offsetof(struct cls##__ilayout, chead)))
 
-/* --- @SOD__CAR@ --- *
+/* --- @SOD_CAR@ --- *
  *
  * Arguments:	@...@ = a nonempty list of arguments
  *
@@ -132,7 +132,7 @@ struct sod_chain {
  */
 
 #if __STDC_VERSION__ >= 199901
-#  define SOD__CAR(...) SOD__CARx(__VA_LIST__, _)
+#  define SOD_CAR(...) SOD__CARx(__VA_LIST__, _)
 #  define SOD__CARx(a, ...) a
 #endif
 
diff --git a/src/class-output.lisp b/src/class-output.lisp
index d914864..8880df5 100644
--- a/src/class-output.lisp
+++ b/src/class-output.lisp
@@ -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))
-- 
2.11.0