Skip to content

gh-124956: Use #undef for temp macros in _csv.c #124957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 7, 2024
Merged

gh-124956: Use #undef for temp macros in _csv.c #124957

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Modules/_csv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,8 @@ static struct PyMemberDef Dialect_memberlist[] = {
{ NULL }
};

#undef D_OFF

static PyGetSetDef Dialect_getsetlist[] = {
{ "delimiter", (getter)Dialect_get_delimiter},
{ "escapechar", (getter)Dialect_get_escapechar},
Expand Down Expand Up @@ -502,6 +504,7 @@ dialect_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
DIALECT_GETATTR(skipinitialspace, "skipinitialspace");
DIALECT_GETATTR(strict, "strict");
}
#undef DIALECT_GETATTR

/* check types and convert to C values */
#define DIASET(meth, name, target, src, dflt) \
Expand All @@ -515,6 +518,7 @@ dialect_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
DIASET(_set_int, "quoting", &self->quoting, quoting, QUOTE_MINIMAL);
DIASET(_set_bool, "skipinitialspace", &self->skipinitialspace, skipinitialspace, false);
DIASET(_set_bool, "strict", &self->strict, strict, false);
#undef DIASET

/* validate options */
if (dialect_check_quoting(self->quoting))
Expand Down Expand Up @@ -1026,6 +1030,8 @@ static struct PyMemberDef Reader_memberlist[] = {
{ NULL }
};

#undef R_OFF


static PyType_Slot Reader_Type_slots[] = {
{Py_tp_doc, (char*)Reader_Type_doc},
Expand Down Expand Up @@ -1441,6 +1447,8 @@ static struct PyMemberDef Writer_memberlist[] = {
{ NULL }
};

#undef W_OFF

static int
Writer_traverse(WriterObj *self, visitproc visit, void *arg)
{
Expand Down
Loading