From 4a21e57fe55076c77b0ee454e1994ca544d09dc0 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@python.org>
Date: Wed, 15 Apr 2020 02:35:41 +0200
Subject: 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.
---
 Python/Python-ast.c   | 2 +-
 Python/ceval.c        | 1 -
 Python/context.c      | 2 +-
 Python/hamt.c         | 4 ++--
 Python/structmember.c | 3 +--
 Python/symtable.c     | 2 +-
 Python/traceback.c    | 2 +-
 7 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'Python')

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>
-- 
cgit v1.2.1