traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Victor Stinner 2020-04-15 02:35:41 +02:00 committed by GitHub
parent 62183b8d6d
commit 4a21e57fe5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
78 changed files with 99 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Modules/_abc.c
View File

@ -1,7 +1,6 @@
/* ABCMeta implementation */ /* ABCMeta implementation */
#include "Python.h" #include "Python.h"
#include "structmember.h"
#include "clinic/_abc.c.h" #include "clinic/_abc.c.h"
/*[clinic input] /*[clinic input]

2
Modules/_asynciomodule.c
View File

@ -1,5 +1,5 @@
#include "Python.h" #include "Python.h"
#include "structmember.h" #include <stddef.h> // offsetof()
/*[clinic input] /*[clinic input]

2
Modules/_bz2module.c
View File

@ -3,7 +3,7 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include <bzlib.h> #include <bzlib.h>
#include <stdio.h> #include <stdio.h>

4
Modules/_collectionsmodule.c
View File

@ -1,10 +1,10 @@
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#ifdef STDC_HEADERS #ifdef STDC_HEADERS
#include <stddef.h> #include <stddef.h>
#else #else
#include <sys/types.h> /* For size_t */ #include <sys/types.h> // size_t
#endif #endif
/*[clinic input] /*[clinic input]

2
Modules/_csv.c
View File

@ -11,7 +11,7 @@ module instead.
#define MODULE_VERSION "1.0" #define MODULE_VERSION "1.0"
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include <stdbool.h> #include <stdbool.h>

2
Modules/_ctypes/_ctypes.c
View File

@ -102,7 +102,7 @@ bytes(cdata)
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include <ffi.h> #include <ffi.h>
#ifdef MS_WIN32 #ifdef MS_WIN32

4
Modules/_ctypes/callproc.c
View File

@ -55,7 +55,7 @@
*/ */
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#ifdef MS_WIN32 #ifdef MS_WIN32
#include <windows.h> #include <windows.h>
@ -751,7 +751,7 @@ static int ConvParam(PyObject *obj, Py_ssize_t index, struct argument *pa)
#if defined(MS_WIN32) && !defined(_WIN32_WCE) #if defined(MS_WIN32) && !defined(_WIN32_WCE)
/* /*
Per: https://msdn.microsoft.com/en-us/library/7572ztz4.aspx Per: https://msdn.microsoft.com/en-us/library/7572ztz4.aspx
To be returned by value in RAX, user-defined types must have a length To be returned by value in RAX, user-defined types must have a length
of 1, 2, 4, 8, 16, 32, or 64 bits of 1, 2, 4, 8, 16, 32, or 64 bits
*/ */
int can_return_struct_as_int(size_t s) int can_return_struct_as_int(size_t s)

2
Modules/_datetimemodule.c
View File

@ -9,7 +9,7 @@
#include "Python.h" #include "Python.h"
#include "datetime.h" #include "datetime.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include <time.h> #include <time.h>

1
Modules/_decimal/_decimal.c
View File

@ -28,7 +28,6 @@
#include <Python.h> #include <Python.h>
#include "longintrepr.h" #include "longintrepr.h"
#include "structmember.h"
#include "complexobject.h" #include "complexobject.h"
#include "mpdecimal.h" #include "mpdecimal.h"

2
Modules/_elementtree.c
View File

@ -14,7 +14,7 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* configuration */ /* configuration */

4
Modules/_functoolsmodule.c
View File

@ -1,8 +1,8 @@
#include "Python.h" #include "Python.h"
#include "pycore_pymem.h" #include "pycore_pymem.h"
#include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_pystate.h" // _PyThreadState_GET()
#include "pycore_tupleobject.h" #include "pycore_tupleobject.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
/* _functools module written and maintained /* _functools module written and maintained
by Hye-Shik Chang <perky@FreeBSD.org> by Hye-Shik Chang <perky@FreeBSD.org>

1
Modules/_hashopenssl.c
View File

@ -14,7 +14,6 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "structmember.h"
#include "hashlib.h" #include "hashlib.h"
#include "pystrhex.h" #include "pystrhex.h"

1
Modules/_io/_iomodule.c
View File

@ -9,7 +9,6 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "structmember.h"
#include "_iomodule.h" #include "_iomodule.h"
#ifdef HAVE_SYS_TYPES_H #ifdef HAVE_SYS_TYPES_H

2
Modules/_io/bufferedio.c
View File

@ -10,7 +10,7 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "pycore_object.h" #include "pycore_object.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include "_iomodule.h" #include "_iomodule.h"
/*[clinic input] /*[clinic input]

2
Modules/_io/bytesio.c
View File

@ -1,6 +1,6 @@
#include "Python.h" #include "Python.h"
#include "pycore_object.h" #include "pycore_object.h"
#include "structmember.h" /* for offsetof() */ #include <stddef.h> // offsetof()
#include "_iomodule.h" #include "_iomodule.h"
/*[clinic input] /*[clinic input]

2
Modules/_io/fileio.c
View File

@ -3,7 +3,7 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "pycore_object.h" #include "pycore_object.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include <stdbool.h> #include <stdbool.h>
#ifdef HAVE_SYS_TYPES_H #ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>

2
Modules/_io/iobase.c
View File

@ -11,7 +11,7 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "pycore_object.h" #include "pycore_object.h"
#include "structmember.h" #include <stddef.h> // offsetof()
#include "_iomodule.h" #include "_iomodule.h"
/*[clinic input] /*[clinic input]

2
Modules/_io/stringio.c
View File

@ -1,6 +1,6 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "structmember.h" #include <stddef.h> // offsetof()
#include "pycore_accu.h" #include "pycore_accu.h"
#include "pycore_object.h" #include "pycore_object.h"
#include "_iomodule.h" #include "_iomodule.h"

6
Modules/_io/textio.c
View File

@ -8,10 +8,10 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "pycore_interp.h" // PyInterpreterState.fs_codec #include "pycore_interp.h" // PyInterpreterState.fs_codec
#include "pycore_object.h" #include "pycore_object.h"
#include "pycore_pystate.h" // _PyInterpreterState_GET() #include "pycore_pystate.h" // _PyInterpreterState_GET()
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include "_iomodule.h" #include "_iomodule.h"
/*[clinic input] /*[clinic input]

2
Modules/_io/winconsoleio.c
View File

@ -12,7 +12,7 @@
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
#include "structmember.h" #include "structmember.h" // PyMemberDef
#ifdef HAVE_SYS_TYPES_H #ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif

2
Modules/_json.c
View File

@ -9,7 +9,7 @@
#endif #endif
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include "pycore_accu.h" #include "pycore_accu.h"
typedef struct { typedef struct {

2
Modules/_lzmamodule.c
View File

@ -8,7 +8,7 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>

1
Modules/_multiprocessing/posixshmem.c
View File

@ -5,7 +5,6 @@ posixshmem - A Python extension that provides shm_open() and shm_unlink()
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include <Python.h> #include <Python.h>
#include "structmember.h"
// for shm_open() and shm_unlink() // for shm_open() and shm_unlink()
#ifdef HAVE_SYS_MMAN_H #ifdef HAVE_SYS_MMAN_H

2
Modules/_pickle.c
View File

@ -9,7 +9,7 @@
#endif #endif
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
PyDoc_STRVAR(pickle_module_doc, PyDoc_STRVAR(pickle_module_doc,
"Optimized C implementation for the Python pickle module."); "Optimized C implementation for the Python pickle module.");

2
Modules/_queuemodule.c
View File

@ -1,5 +1,5 @@
#include "Python.h" #include "Python.h"
#include "structmember.h" /* offsetof */ #include <stddef.h> // offsetof()
/*[clinic input] /*[clinic input]
module _queue module _queue

2
Modules/_sqlite/connection.c
View File

@ -23,7 +23,7 @@
#include "cache.h" #include "cache.h"
#include "module.h" #include "module.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include "connection.h" #include "connection.h"
#include "statement.h" #include "statement.h"
#include "cursor.h" #include "cursor.h"

1
Modules/_sqlite/microprotocols.c
View File

@ -24,7 +24,6 @@
*/ */
#include <Python.h> #include <Python.h>
#include <structmember.h>
#include "cursor.h" #include "cursor.h"
#include "microprotocols.h" #include "microprotocols.h"

2
Modules/_sre.c
View File

@ -41,7 +41,7 @@ static const char copyright[] =
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "structmember.h" /* offsetof */ #include "structmember.h" // PyMemberDef
#include "sre.h" #include "sre.h"

1
Modules/_statisticsmodule.c
View File

@ -1,7 +1,6 @@
/* statistics accelerator C extension: _statistics module. */ /* statistics accelerator C extension: _statistics module. */
#include "Python.h" #include "Python.h"
#include "structmember.h"
#include "clinic/_statisticsmodule.c.h" #include "clinic/_statisticsmodule.c.h"
/*[clinic input] /*[clinic input]

2
Modules/_struct.c
View File

@ -6,7 +6,7 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include <ctype.h> #include <ctype.h>
/*[clinic input] /*[clinic input]

2
Modules/_testcapimodule.c
View File

@ -17,7 +17,7 @@
#include "Python.h" #include "Python.h"
#include "datetime.h" #include "datetime.h"
#include "marshal.h" #include "marshal.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include <float.h> #include <float.h>
#include <signal.h> #include <signal.h>

8
Modules/_threadmodule.c
View File

@ -4,9 +4,9 @@
#include "Python.h" #include "Python.h"
#include "pycore_pylifecycle.h" #include "pycore_pylifecycle.h"
#include "pycore_interp.h" // _PyInterpreterState.num_threads #include "pycore_interp.h" // _PyInterpreterState.num_threads
#include "pycore_pystate.h" // _PyThreadState_Init() #include "pycore_pystate.h" // _PyThreadState_Init()
#include <stddef.h> // offsetof() #include <stddef.h> // offsetof()
static PyObject *ThreadError; static PyObject *ThreadError;
static PyObject *str_dict; static PyObject *str_dict;
@ -587,8 +587,6 @@ newlockobject(void)
/* Thread-local objects */ /* Thread-local objects */
#include "structmember.h"
/* Quick overview: /* Quick overview:
We need to be able to reclaim reference cycles as soon as possible We need to be able to reclaim reference cycles as soon as possible

6
Modules/_winapi.c
View File

@ -35,7 +35,7 @@
/* See http://www.python.org/2.4/license for licensing details. */ /* See http://www.python.org/2.4/license for licensing details. */
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#define WINDOWS_LEAN_AND_MEAN #define WINDOWS_LEAN_AND_MEAN
#include "windows.h" #include "windows.h"
@ -1110,8 +1110,8 @@ _winapi_CreateProcess_impl(PyObject *module,
} }
} }
else if (command_line != Py_None) { else if (command_line != Py_None) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"CreateProcess() argument 2 must be str or None, not %s", "CreateProcess() argument 2 must be str or None, not %s",
Py_TYPE(command_line)->tp_name); Py_TYPE(command_line)->tp_name);
goto cleanup; goto cleanup;
} }

2
Modules/arraymodule.c
View File

@ -5,7 +5,7 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "structmember.h" #include <stddef.h> // offsetof()
#ifdef STDC_HEADERS #ifdef STDC_HEADERS
#include <stddef.h> #include <stddef.h>

2
Modules/cjkcodecs/multibytecodec.c
View File

@ -6,7 +6,7 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include "multibytecodec.h" #include "multibytecodec.h"
#include "clinic/multibytecodec.c.h" #include "clinic/multibytecodec.c.h"

2
Modules/itertoolsmodule.c
View File

@ -2,7 +2,7 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "pycore_tupleobject.h" #include "pycore_tupleobject.h"
#include "structmember.h" #include <stddef.h> // offsetof()
/* Itertools module written and maintained /* Itertools module written and maintained
by Raymond D. Hettinger <python@rcn.com> by Raymond D. Hettinger <python@rcn.com>

2
Modules/mmapmodule.c
View File

@ -20,7 +20,7 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include <Python.h> #include <Python.h>
#include "structmember.h" #include <stddef.h> // offsetof()
#ifndef MS_WINDOWS #ifndef MS_WINDOWS
#define UNIX #define UNIX

2
Modules/ossaudiodev.c
View File

@ -19,7 +19,7 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#ifdef HAVE_FCNTL_H #ifdef HAVE_FCNTL_H
#include <fcntl.h> #include <fcntl.h>

2
Modules/overlapped.c
View File

@ -8,7 +8,7 @@
Check itemsize */ Check itemsize */
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#define WINDOWS_LEAN_AND_MEAN #define WINDOWS_LEAN_AND_MEAN
#include <winsock2.h> #include <winsock2.h>

8
Modules/posixmodule.c
View File

@ -35,10 +35,10 @@
# include <windows.h> # include <windows.h>
#endif #endif
#include "pycore_ceval.h" /* _PyEval_ReInitThreads() */ #include "pycore_ceval.h" // _PyEval_ReInitThreads()
#include "pycore_import.h" /* _PyImport_ReInitLock() */ #include "pycore_import.h" // _PyImport_ReInitLock()
#include "pycore_pystate.h" /* _PyInterpreterState_GET() */ #include "pycore_pystate.h" // _PyInterpreterState_GET()
#include "structmember.h" #include "structmember.h" // PyMemberDef
#ifndef MS_WINDOWS #ifndef MS_WINDOWS
# include "posixmodule.h" # include "posixmodule.h"
#else #else

2
Modules/pyexpat.c
View File

@ -1,7 +1,7 @@
#include "Python.h" #include "Python.h"
#include <ctype.h> #include <ctype.h>
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include "frameobject.h" #include "frameobject.h"
#include "expat.h" #include "expat.h"

2
Modules/selectmodule.c
View File

@ -9,7 +9,7 @@
#endif #endif
#include "Python.h" #include "Python.h"
#include <structmember.h> #include "structmember.h" // PyMemberDef
#ifdef HAVE_SYS_DEVPOLL_H #ifdef HAVE_SYS_DEVPOLL_H
#include <sys/resource.h> #include <sys/resource.h>

2
Modules/sha256module.c
View File

@ -17,7 +17,7 @@
/* SHA objects */ /* SHA objects */
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include "hashlib.h" #include "hashlib.h"
#include "pystrhex.h" #include "pystrhex.h"

2
Modules/sha512module.c
View File

@ -17,7 +17,7 @@
/* SHA objects */ /* SHA objects */
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include "hashlib.h" #include "hashlib.h"
#include "pystrhex.h" #include "pystrhex.h"

2
Modules/socketmodule.c
View File

@ -101,7 +101,7 @@ Local naming conventions:
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#ifdef _Py_MEMORY_SANITIZER #ifdef _Py_MEMORY_SANITIZER
# include <sanitizer/msan_interface.h> # include <sanitizer/msan_interface.h>

2
Modules/unicodedata.c
View File

@ -17,7 +17,7 @@
#include "Python.h" #include "Python.h"
#include "ucnhash.h" #include "ucnhash.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include <stdbool.h> #include <stdbool.h>

2
Modules/xxsubtype.c
View File

@ -1,5 +1,5 @@
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
PyDoc_STRVAR(xxsubtype__doc__, PyDoc_STRVAR(xxsubtype__doc__,
"xxsubtype is an example module showing how to subtype builtin types from C.\n" "xxsubtype is an example module showing how to subtype builtin types from C.\n"

2
Modules/zlibmodule.c
View File

@ -6,7 +6,7 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include "zlib.h" #include "zlib.h"

8
Objects/abstract.c
View File

@ -1,12 +1,12 @@
/* Abstract Object Interface (many thanks to Jim Fulton) */ /* Abstract Object Interface (many thanks to Jim Fulton) */
#include "Python.h" #include "Python.h"
#include "pycore_abstract.h" // _PyIndex_Check() #include "pycore_abstract.h" // _PyIndex_Check()
#include "pycore_ceval.h" // _Py_EnterRecursiveCall() #include "pycore_ceval.h" // _Py_EnterRecursiveCall()
#include "pycore_pyerrors.h" #include "pycore_pyerrors.h"
#include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_pystate.h" // _PyThreadState_GET()
#include <ctype.h> #include <ctype.h>
#include "structmember.h" /* we need the offsetof() macro from there */ #include <stddef.h> // offsetof()
#include "longintrepr.h" #include "longintrepr.h"

3
Objects/bytearrayobject.c
View File

@ -2,11 +2,10 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "pycore_abstract.h" // _PyIndex_Check() #include "pycore_abstract.h" // _PyIndex_Check()
#include "pycore_bytes_methods.h" #include "pycore_bytes_methods.h"
#include "pycore_object.h" #include "pycore_object.h"
#include "pycore_pymem.h" #include "pycore_pymem.h"
#include "structmember.h"
#include "bytesobject.h" #include "bytesobject.h"
#include "pystrhex.h" #include "pystrhex.h"

4
Objects/classobject.c
View File

@ -4,8 +4,8 @@
#include "pycore_object.h" #include "pycore_object.h"
#include "pycore_pyerrors.h" #include "pycore_pyerrors.h"
#include "pycore_pymem.h" #include "pycore_pymem.h"
#include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_pystate.h" // _PyThreadState_GET()
#include "structmember.h" #include "structmember.h" // PyMemberDef
#define TP_DESCR_GET(t) ((t)->tp_descr_get) #define TP_DESCR_GET(t) ((t)->tp_descr_get)

2
Objects/codeobject.c
View File

@ -3,7 +3,7 @@
#include "Python.h" #include "Python.h"
#include "code.h" #include "code.h"
#include "opcode.h" #include "opcode.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include "pycore_code.h" #include "pycore_code.h"
#include "pycore_interp.h" // PyInterpreterState.co_extra_freefuncs #include "pycore_interp.h" // PyInterpreterState.co_extra_freefuncs
#include "pycore_pystate.h" // _PyInterpreterState_GET() #include "pycore_pystate.h" // _PyInterpreterState_GET()

2
Objects/complexobject.c
View File

@ -6,7 +6,7 @@
/* Submitted by Jim Hugunin */ /* Submitted by Jim Hugunin */
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
/*[clinic input] /*[clinic input]
class complex "PyComplexObject *" "&PyComplex_Type" class complex "PyComplexObject *" "&PyComplex_Type"

2
Objects/descrobject.c
View File

@ -5,7 +5,7 @@
#include "pycore_object.h" #include "pycore_object.h"
#include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_pystate.h" // _PyThreadState_GET()
#include "pycore_tupleobject.h" #include "pycore_tupleobject.h"
#include "structmember.h" /* Why is this not included in Python.h? */ #include "structmember.h" // PyMemberDef
_Py_IDENTIFIER(getattr); _Py_IDENTIFIER(getattr);

2
Objects/exceptions.c
View File

@ -9,7 +9,7 @@
#include "pycore_initconfig.h" #include "pycore_initconfig.h"
#include "pycore_object.h" #include "pycore_object.h"
#include "pycore_pymem.h" #include "pycore_pymem.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include "osdefs.h" #include "osdefs.h"

2
Objects/frameobject.c
View File

@ -7,7 +7,7 @@
#include "code.h" #include "code.h"
#include "frameobject.h" #include "frameobject.h"
#include "opcode.h" #include "opcode.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#define OFF(x) offsetof(PyFrameObject, x) #define OFF(x) offsetof(PyFrameObject, x)

2
Objects/funcobject.c
View File

@ -6,7 +6,7 @@
#include "pycore_pymem.h" #include "pycore_pymem.h"
#include "pycore_tupleobject.h" #include "pycore_tupleobject.h"
#include "code.h" #include "code.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
PyObject * PyObject *
PyFunction_NewWithQualName(PyObject *code, PyObject *globals, PyObject *qualname) PyFunction_NewWithQualName(PyObject *code, PyObject *globals, PyObject *qualname)

4
Objects/genericaliasobject.c
View File

@ -2,7 +2,7 @@
#include "Python.h" #include "Python.h"
#include "pycore_object.h" #include "pycore_object.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
@ -118,7 +118,7 @@ ga_repr(PyObject *self)
_PyUnicodeWriter writer; _PyUnicodeWriter writer;
_PyUnicodeWriter_Init(&writer); _PyUnicodeWriter_Init(&writer);
if (ga_repr_item(&writer, alias->origin) < 0) { if (ga_repr_item(&writer, alias->origin) < 0) {
goto error; goto error;
} }

6
Objects/genobject.c
View File

@ -1,11 +1,11 @@
/* Generator object implementation */ /* Generator object implementation */
#include "Python.h" #include "Python.h"
#include "pycore_ceval.h" // _PyEval_EvalFrame() #include "pycore_ceval.h" // _PyEval_EvalFrame()
#include "pycore_object.h" #include "pycore_object.h"
#include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_pystate.h" // _PyThreadState_GET()
#include "frameobject.h" #include "frameobject.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include "opcode.h" #include "opcode.h"
static PyObject *gen_close(PyGenObject *, PyObject *); static PyObject *gen_close(PyGenObject *, PyObject *);

6
Objects/methodobject.c
View File

@ -2,12 +2,12 @@
/* Method object implementation */ /* Method object implementation */
#include "Python.h" #include "Python.h"
#include "pycore_ceval.h" // _Py_EnterRecursiveCall() #include "pycore_ceval.h" // _Py_EnterRecursiveCall()
#include "pycore_object.h" #include "pycore_object.h"
#include "pycore_pyerrors.h" #include "pycore_pyerrors.h"
#include "pycore_pymem.h" #include "pycore_pymem.h"
#include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_pystate.h" // _PyThreadState_GET()
#include "structmember.h" #include "structmember.h" // PyMemberDef
/* undefine macro trampoline to PyCFunction_NewEx */ /* undefine macro trampoline to PyCFunction_NewEx */
#undef PyCFunction_New #undef PyCFunction_New

6
Objects/moduleobject.c
View File

@ -2,9 +2,9 @@
/* Module object implementation */ /* Module object implementation */
#include "Python.h" #include "Python.h"
#include "pycore_interp.h" // PyInterpreterState.importlib #include "pycore_interp.h" // PyInterpreterState.importlib
#include "pycore_pystate.h" // _PyInterpreterState_GET() #include "pycore_pystate.h" // _PyInterpreterState_GET()
#include "structmember.h" #include "structmember.h" // PyMemberDef
static Py_ssize_t max_module_number; static Py_ssize_t max_module_number;

2
Objects/namespaceobject.c
View File

@ -1,7 +1,7 @@
// namespace object implementation // namespace object implementation
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
typedef struct { typedef struct {

2
Objects/odictobject.c
View File

@ -466,7 +466,7 @@ later:
#include "Python.h" #include "Python.h"
#include "pycore_object.h" #include "pycore_object.h"
#include "structmember.h" #include <stddef.h> // offsetof()
#include "dict-common.h" #include "dict-common.h"
#include <stddef.h> #include <stddef.h>

2
Objects/rangeobject.c
View File

@ -3,7 +3,7 @@
#include "Python.h" #include "Python.h"
#include "pycore_abstract.h" // _PyIndex_Check() #include "pycore_abstract.h" // _PyIndex_Check()
#include "pycore_tupleobject.h" #include "pycore_tupleobject.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
/* Support objects whose length is > PY_SSIZE_T_MAX. /* Support objects whose length is > PY_SSIZE_T_MAX.

4
Objects/setobject.c
View File

@ -32,8 +32,8 @@
*/ */
#include "Python.h" #include "Python.h"
#include "pycore_object.h" // _PyObject_GC_UNTRACK() #include "pycore_object.h" // _PyObject_GC_UNTRACK()
#include "structmember.h" #include <stddef.h> // offsetof()
/* Object used as dummy key to fill deleted entries */ /* Object used as dummy key to fill deleted entries */
static PyObject _dummy_struct; static PyObject _dummy_struct;

4
Objects/sliceobject.c
View File

@ -14,10 +14,10 @@ this type and there is exactly one in existence.
*/ */
#include "Python.h" #include "Python.h"
#include "pycore_abstract.h" // _PyIndex_Check() #include "pycore_abstract.h" // _PyIndex_Check()
#include "pycore_object.h" #include "pycore_object.h"
#include "pycore_pymem.h" #include "pycore_pymem.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
static PyObject * static PyObject *
ellipsis_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) ellipsis_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)

2
Objects/structseq.c
View File

@ -10,7 +10,7 @@
#include "Python.h" #include "Python.h"
#include "pycore_tupleobject.h" #include "pycore_tupleobject.h"
#include "pycore_object.h" #include "pycore_object.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
static const char visible_length_key[] = "n_sequence_fields"; static const char visible_length_key[] = "n_sequence_fields";
static const char real_length_key[] = "n_fields"; static const char real_length_key[] = "n_fields";

4
Objects/typeobject.c
View File

@ -5,9 +5,9 @@
#include "pycore_initconfig.h" #include "pycore_initconfig.h"
#include "pycore_object.h" #include "pycore_object.h"
#include "pycore_pyerrors.h" #include "pycore_pyerrors.h"
#include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_pystate.h" // _PyThreadState_GET()
#include "frameobject.h" #include "frameobject.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include <ctype.h> #include <ctype.h>

4
Objects/weakrefobject.c
View File

@ -1,6 +1,6 @@
#include "Python.h" #include "Python.h"
#include "pycore_object.h" // _PyObject_GET_WEAKREFS_LISTPTR #include "pycore_object.h" // _PyObject_GET_WEAKREFS_LISTPTR()
#include "structmember.h" #include "structmember.h" // PyMemberDef
#define GET_WEAKREFS_LISTPTR(o) \ #define GET_WEAKREFS_LISTPTR(o) \

4
PC/winreg.c
View File

@ -14,8 +14,8 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include "windows.h" #include <windows.h>
static BOOL PyHKEY_AsHKEY(PyObject *ob, HKEY *pRes, BOOL bNoneOK); static BOOL PyHKEY_AsHKEY(PyObject *ob, HKEY *pRes, BOOL bNoneOK);
static BOOL clinic_HKEY_converter(PyObject *ob, void *p); static BOOL clinic_HKEY_converter(PyObject *ob, void *p);

2
Parser/asdl_c.py
View File

@ -1428,7 +1428,7 @@ def main(srcfile, dump_module=False):
f.write('\n') f.write('\n')
f.write('#include "Python.h"\n') f.write('#include "Python.h"\n')
f.write('#include "%s-ast.h"\n' % mod.name) f.write('#include "%s-ast.h"\n' % mod.name)
f.write('#include "structmember.h"\n') f.write('#include "structmember.h" // PyMemberDef\n')
f.write('\n') f.write('\n')
generate_module_def(f, mod) generate_module_def(f, mod)

2
Python/Python-ast.c generated
View File

@ -4,7 +4,7 @@
#include "Python.h" #include "Python.h"
#include "Python-ast.h" #include "Python-ast.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
typedef struct { typedef struct {
int initialized; int initialized;

1
Python/ceval.c
View File

@ -29,7 +29,6 @@
#include "opcode.h" #include "opcode.h"
#include "pydtrace.h" #include "pydtrace.h"
#include "setobject.h" #include "setobject.h"
#include "structmember.h"
#include <ctype.h> #include <ctype.h>

2
Python/context.c
View File

@ -6,7 +6,7 @@
#include "pycore_object.h" #include "pycore_object.h"
#include "pycore_pyerrors.h" #include "pycore_pyerrors.h"
#include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_pystate.h" // _PyThreadState_GET()
#include "structmember.h" #include "structmember.h" // PyMemberDef
#define CONTEXT_FREELIST_MAXLEN 255 #define CONTEXT_FREELIST_MAXLEN 255

4
Python/hamt.c
View File

@ -1,8 +1,8 @@
#include "Python.h" #include "Python.h"
#include "pycore_hamt.h" #include "pycore_hamt.h"
#include "pycore_object.h" // _PyObject_GC_TRACK() #include "pycore_object.h" // _PyObject_GC_TRACK()
#include "structmember.h" #include <stddef.h> // offsetof()
/* /*
This file provides an implementation of an immutable mapping using the This file provides an implementation of an immutable mapping using the

3
Python/structmember.c
View File

@ -2,8 +2,7 @@
/* Map C struct members to Python object attributes */ /* Map C struct members to Python object attributes */
#include "Python.h" #include "Python.h"
#include "structmember.h" // PyMemberDef
#include "structmember.h"
PyObject * PyObject *
PyMember_GetOne(const char *addr, PyMemberDef *l) PyMember_GetOne(const char *addr, PyMemberDef *l)

2
Python/symtable.c
View File

@ -2,7 +2,7 @@
#include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_pystate.h" // _PyThreadState_GET()
#include "symtable.h" #include "symtable.h"
#undef Yield /* undefine macro conflicting with <winbase.h> */ #undef Yield /* undefine macro conflicting with <winbase.h> */
#include "structmember.h" #include "structmember.h" // PyMemberDef
/* error strings used for warnings */ /* error strings used for warnings */
#define GLOBAL_PARAM \ #define GLOBAL_PARAM \

2
Python/traceback.c
View File

@ -5,7 +5,7 @@
#include "code.h" #include "code.h"
#include "frameobject.h" #include "frameobject.h"
#include "structmember.h" #include "structmember.h" // PyMemberDef
#include "osdefs.h" #include "osdefs.h"
#ifdef HAVE_FCNTL_H #ifdef HAVE_FCNTL_H
#include <fcntl.h> #include <fcntl.h>