summaryrefslogtreecommitdiff
path: root/Python
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2020-04-15 02:35:41 +0200
committerGitHub <noreply@github.com>2020-04-15 02:35:41 +0200
commit4a21e57fe55076c77b0ee454e1994ca544d09dc0 (patch)
tree1c9ed1c1a467357a470cd37b98e20aa5b9878cf9 /Python
parent62183b8d6d49e59c6a98bbdaa65b7ea1415abb7f (diff)
downloadcpython-git-4a21e57fe55076c77b0ee454e1994ca544d09dc0.tar.gz
bpo-40268: Remove unused structmember.h includes (GH-19530)
If only offsetof() is needed: include stddef.h instead. When structmember.h is used, add a comment explaining that PyMemberDef is used.
Diffstat (limited to 'Python')
-rw-r--r--Python/Python-ast.c2
-rw-r--r--Python/ceval.c1
-rw-r--r--Python/context.c2
-rw-r--r--Python/hamt.c4
-rw-r--r--Python/structmember.c3
-rw-r--r--Python/symtable.c2
-rw-r--r--Python/traceback.c2
7 files changed, 7 insertions, 9 deletions
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index 488276a455..80f91646fd 100644
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -4,7 +4,7 @@
#include "Python.h"
#include "Python-ast.h"
-#include "structmember.h"
+#include "structmember.h" // PyMemberDef
typedef struct {
int initialized;
diff --git a/Python/ceval.c b/Python/ceval.c
index 5e54356719..59765d850b 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -29,7 +29,6 @@
#include "opcode.h"
#include "pydtrace.h"
#include "setobject.h"
-#include "structmember.h"
#include <ctype.h>
diff --git a/Python/context.c b/Python/context.c
index 15749e9fd7..f0217f2801 100644
--- a/Python/context.c
+++ b/Python/context.c
@@ -6,7 +6,7 @@
#include "pycore_object.h"
#include "pycore_pyerrors.h"
#include "pycore_pystate.h" // _PyThreadState_GET()
-#include "structmember.h"
+#include "structmember.h" // PyMemberDef
#define CONTEXT_FREELIST_MAXLEN 255
diff --git a/Python/hamt.c b/Python/hamt.c
index 9924e33512..8801c5ea41 100644
--- a/Python/hamt.c
+++ b/Python/hamt.c
@@ -1,8 +1,8 @@
#include "Python.h"
#include "pycore_hamt.h"
-#include "pycore_object.h" // _PyObject_GC_TRACK()
-#include "structmember.h"
+#include "pycore_object.h" // _PyObject_GC_TRACK()
+#include <stddef.h> // offsetof()
/*
This file provides an implementation of an immutable mapping using the
diff --git a/Python/structmember.c b/Python/structmember.c
index e653d0277c..ba88e15f93 100644
--- a/Python/structmember.c
+++ b/Python/structmember.c
@@ -2,8 +2,7 @@
/* Map C struct members to Python object attributes */
#include "Python.h"
-
-#include "structmember.h"
+#include "structmember.h" // PyMemberDef
PyObject *
PyMember_GetOne(const char *addr, PyMemberDef *l)
diff --git a/Python/symtable.c b/Python/symtable.c
index a3c5d650d1..d192f31dee 100644
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -2,7 +2,7 @@
#include "pycore_pystate.h" // _PyThreadState_GET()
#include "symtable.h"
#undef Yield /* undefine macro conflicting with <winbase.h> */
-#include "structmember.h"
+#include "structmember.h" // PyMemberDef
/* error strings used for warnings */
#define GLOBAL_PARAM \
diff --git a/Python/traceback.c b/Python/traceback.c
index 610c2172ef..e3397ecfe4 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -5,7 +5,7 @@
#include "code.h"
#include "frameobject.h"
-#include "structmember.h"
+#include "structmember.h" // PyMemberDef
#include "osdefs.h"
#ifdef HAVE_FCNTL_H
#include <fcntl.h>