aboutsummaryrefslogtreecommitdiff
path: root/PC
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2020-06-16 01:28:07 +0200
committerGitHub <noreply@github.com>2020-06-16 01:28:07 +0200
commit04fc4f2a46b2fd083639deb872c3a3037fdb47d6 (patch)
tree3fc5a585683e09748fb3113c34cfa42e8bf634b2 /PC
parentbpo-36020: Require vsnprintf() to build Python (GH-20899) (diff)
downloadcpython-04fc4f2a46b2fd083639deb872c3a3037fdb47d6.tar.gz
cpython-04fc4f2a46b2fd083639deb872c3a3037fdb47d6.tar.bz2
cpython-04fc4f2a46b2fd083639deb872c3a3037fdb47d6.zip
bpo-40989: PyObject_INIT() becomes an alias to PyObject_Init() (GH-20901)
The PyObject_INIT() and PyObject_INIT_VAR() macros become aliases to, respectively, PyObject_Init() and PyObject_InitVar() functions. Rename _PyObject_INIT() and _PyObject_INIT_VAR() static inline functions to, respectively, _PyObject_Init() and _PyObject_InitVar(), and move them to pycore_object.h. Remove their return value: their return type becomes void. The _datetime module is now built with the Py_BUILD_CORE_MODULE macro defined. Remove an outdated comment on _Py_tracemalloc_config.
Diffstat (limited to 'PC')
-rw-r--r--PC/winreg.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/PC/winreg.c b/PC/winreg.c
index 1305b7030fa..7c3b2f4be85 100644
--- a/PC/winreg.c
+++ b/PC/winreg.c
@@ -14,6 +14,7 @@
#define PY_SSIZE_T_CLEAN
#include "Python.h"
+#include "pycore_object.h" // _PyObject_Init()
#include "structmember.h" // PyMemberDef
#include <windows.h>
@@ -457,13 +458,12 @@ clinic_HKEY_converter(PyObject *ob, void *p)
PyObject *
PyHKEY_FromHKEY(HKEY h)
{
- PyHKEYObject *op;
-
/* Inline PyObject_New */
- op = (PyHKEYObject *) PyObject_MALLOC(sizeof(PyHKEYObject));
- if (op == NULL)
+ PyHKEYObject *op = (PyHKEYObject *) PyObject_MALLOC(sizeof(PyHKEYObject));
+ if (op == NULL) {
return PyErr_NoMemory();
- PyObject_INIT(op, &PyHKEY_Type);
+ }
+ _PyObject_Init(op, &PyHKEY_Type);
op->hkey = h;
return (PyObject *)op;
}