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
Next Next commit
bpo-45459: Fix object.h: don't define PyObject type twice 
It's already defined in pybuffer.h.
  • Loading branch information
@vstinner
vstinner committed Feb 23, 2022
commit 2276c6cb42025d5d7056b0d8efc247f6fef39633
4 changes: 2 additions & 2 deletions Include/object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@ typedef struct _typeobject PyTypeObject;
* by hand. Similarly every pointer to a variable-size Python object can,
* in addition, be cast to PyVarObject*.
*/
typedef struct _object {
struct _object {
_PyObject_HEAD_EXTRA
Py_ssize_t ob_refcnt;
PyTypeObject *ob_type;
} PyObject;
};

/* Cast argument to PyObject* type. */
#define _PyObject_CAST(op) ((PyObject*)(op))
Expand Down