bpo-46670: Remove unused macros in the Modules directory (GH-31194)

* bpo-46670: Remove unused macros in the Modules directory

* Add again LINKAT_DIR_FD_CONVERTER: generated by Argument Clinic

diff --git a/Modules/_ctypes/stgdict.c b/Modules/_ctypes/stgdict.c
index 6c1917b18d45099fe1e58989885dcc93f8dcb840..3470cf114db4f96297527872d96d2128ad1bd2e8 100644 (file)
--- a/Modules/_ctypes/stgdict.c
+++ b/Modules/_ctypes/stgdict.c
@@ -504,7 +504,6 @@ PyCStructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct
     if (stgdict->format == NULL)
         return -1;
 
-#define realdict ((PyObject *)&stgdict->dict)
     for (i = 0; i < len; ++i) {
         PyObject *name = NULL, *desc = NULL;
         PyObject *pair = PySequence_GetItem(fields, i);
@@ -635,7 +634,6 @@ PyCStructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct
         Py_DECREF(pair);
         Py_DECREF(prop);
     }
-#undef realdict
 
     if (isStruct && !isPacked) {
         char *ptr = stgdict->format;

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index b2e241a0a338eb7dbe5bd44a6f44f05069b48403..e17876e49a8be43afeb2621c8838af3542d974c4 100644 (file)
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -40,8 +40,6 @@
 #define PySSL_BEGIN_ALLOW_THREADS { \
             PyThreadState *_save = NULL;  \
             PySSL_BEGIN_ALLOW_THREADS_S(_save);
-#define PySSL_BLOCK_THREADS     PySSL_END_ALLOW_THREADS_S(_save);
-#define PySSL_UNBLOCK_THREADS   PySSL_BEGIN_ALLOW_THREADS_S(_save);
 #define PySSL_END_ALLOW_THREADS PySSL_END_ALLOW_THREADS_S(_save); }
 
 

diff --git a/Modules/_struct.c b/Modules/_struct.c
index 210dbdc752f4c1901a1bd62a826f9d7ac3e4d5d0..7d05ec5ac7c50ad0ab5b16b213fa9eff10647bc8 100644 (file)
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -2065,8 +2065,6 @@ static PyMemberDef s_members[] = {
     {NULL}  /* sentinel */
 };
 
-#define OFF(x) offsetof(PyStructObject, x)
-
 static PyGetSetDef s_getsetlist[] = {
     {"format", (getter)s_get_format, (setter)NULL, "struct format string", NULL},
     {"size", (getter)s_get_size, (setter)NULL, "struct size in bytes", NULL},

diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 7369f094faeddec41beca2f1fad5ffcbe944a420..498a7c2fd686b73c52e0c7b2073fb1cc98ea5c3f 100644 (file)
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -6060,8 +6060,6 @@ static PyMethodDef TestMethods[] = {
     {NULL, NULL} /* sentinel */
 };
 
-#define AddSym(d, n, f, v) {PyObject *o = f(v); PyDict_SetItemString(d, n, o); Py_DECREF(o);}
-
 typedef struct {
     char bool_member;
     char byte_member;

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index f4d2716fe302d2a2faa43fe31bb93e00295a065a..cbef9ce0066db5256bdb384a4b3f854d469c2f78 100644 (file)
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -318,10 +318,6 @@ typedef struct {
 
 #define Tkapp_Interp(v) (((TkappObject *) (v))->interp)
 
-#define DEBUG_REFCNT(v) (printf("DEBUG: id=%p, refcnt=%i\n", \
-(void *) v, Py_REFCNT(v)))
-
-
 
 /**** Error Handling ****/
 

diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c
index 14d3f9dcb1c60fde21d2f4b97125504ad5d2f03e..a757380bd09f70c5ced61e41d5cd963deb88c4d9 100644 (file)
--- a/Modules/pwdmodule.c
+++ b/Modules/pwdmodule.c
@@ -84,7 +84,6 @@ mkpwent(PyObject *module, struct passwd *p)
     if (v == NULL)
         return NULL;
 
-#define SETI(i,val) PyStructSequence_SET_ITEM(v, i, PyLong_FromLong((long) val))
 #define SETS(i,val) sets(v, i, val)
 
     SETS(setIndex++, p->pw_name);
@@ -104,7 +103,6 @@ mkpwent(PyObject *module, struct passwd *p)
     SETS(setIndex++, p->pw_shell);
 
 #undef SETS
-#undef SETI
 
     if (PyErr_Occurred()) {
         Py_XDECREF(v);