Skip to content

bpo-45459: Fix object.h: don't define PyObject type twice #31539

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

Closed
vstinner wants to merge 2 commits into from
Closed

bpo-45459: Fix object.h: don't define PyObject type twice #31539

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2276c6c
bpo-45459: Fix object.h: don't define PyObject type twice
vstinner Feb 23, 2022
a36cec0
Fix pybuffer.h
vstinner Feb 23, 2022
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
Prev Previous commit
Fix pybuffer.h
  • Loading branch information
@vstinner
vstinner committed Feb 23, 2022
commit a36cec059b0a090d348d7ed006cd2c674053cd78
8 changes: 4 additions & 4 deletions Include/pybuffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
extern "C" {
#endif

// Forward declaration to be able to include pybuffer.h before object.h:
// pybuffer.h uses PyObject and object.h uses Py_buffer.
typedef struct _object PyObject;

#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030b0000

/* === New Buffer API ============================================
Expand All @@ -17,10 +21,6 @@ extern "C" {
*
*/

// Forward declaration to be able to include pybuffer.h before object.h:
// pybuffer.h uses PyObject and object.h uses Py_buffer.
typedef struct _object PyObject;

typedef struct {
void *buf;
PyObject *obj; /* owned reference */
Expand Down