From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 20 Oct 2019 11:43:40 +0000 (+0100)
Subject: pyke/pyke.h: Add a `MEMBER' variant with explicit member name.
X-Git-Url: https://git.distorted.org.uk/~mdw/pyke/commitdiff_plain/ee4a6b1c978369cf31a2726c190ef6b9506db549

pyke/pyke.h: Add a `MEMBER' variant with explicit member name.
---

diff --git a/pyke.h b/pyke.h
index e7a1ece..3076bb5 100644
--- a/pyke.h
+++ b/pyke.h
@@ -271,15 +271,16 @@ extern PyTypeObject *inittype(PyTypeObject */*skel*/,
 #define GETSET(func, doc)						\
   { #func, GETSETNAME(get, func), GETSETNAME(set, func), doc },
 
-/* Convenience wrapper for filling in `PyMemberDef' tables.  Define
+/* Convenience wrappers for filling in `PyMemberDef' tables.  Define
  * `MEMBERSTRUCT' locally as
  *
  *	#define MEMBERSTRUCT foo_pyobj
  *
  * around the member table.
  */
-#define MEMBER(name, ty, f, doc)					\
-  { #name, ty, offsetof(MEMBERSTRUCT, name), f, doc },
+#define MEMRNM(name, ty, mem, f, doc)					\
+  { #name, ty, offsetof(MEMBERSTRUCT, mem), f, doc },
+#define MEMBER(name, ty, f, doc) MEMRNM(name, ty, name, f, doc)
 
 /* Wrappers for filling in pointers in a `PyTypeObject' structure, (a)
  * following Pyke naming convention, and (b) stripping `const' from the types