@@ -127,49 +127,49 @@ PyAPI_FUNC(int) Py_Is(PyObject *x, PyObject *y);
127
127
#define Py_Is (x , y ) ((x) == (y))
128
128
129
129
130
- static inline Py_ssize_t _Py_REFCNT (const PyObject * ob ) {
130
+ static inline Py_ssize_t Py_REFCNT (const PyObject * ob ) {
131
131
return ob -> ob_refcnt ;
132
132
}
133
- #define Py_REFCNT (ob ) _Py_REFCNT (_PyObject_CAST_CONST(ob))
133
+ #define Py_REFCNT (ob ) Py_REFCNT (_PyObject_CAST_CONST(ob))
134
134
135
135
136
136
// bpo-39573: The Py_SET_TYPE() function must be used to set an object type.
137
- static inline PyTypeObject * _Py_TYPE (const PyObject * ob ) {
137
+ static inline PyTypeObject * Py_TYPE (const PyObject * ob ) {
138
138
return ob -> ob_type ;
139
139
}
140
- #define Py_TYPE (ob ) _Py_TYPE (_PyObject_CAST_CONST(ob))
140
+ #define Py_TYPE (ob ) Py_TYPE (_PyObject_CAST_CONST(ob))
141
141
142
142
// bpo-39573: The Py_SET_SIZE() function must be used to set an object size.
143
- static inline Py_ssize_t _Py_SIZE (const PyVarObject * ob ) {
143
+ static inline Py_ssize_t Py_SIZE (const PyVarObject * ob ) {
144
144
return ob -> ob_size ;
145
145
}
146
- #define Py_SIZE (ob ) _Py_SIZE (_PyVarObject_CAST_CONST(ob))
146
+ #define Py_SIZE (ob ) Py_SIZE (_PyVarObject_CAST_CONST(ob))
147
147
148
148
149
- static inline int _Py_IS_TYPE (const PyObject * ob , const PyTypeObject * type ) {
149
+ static inline int Py_IS_TYPE (const PyObject * ob , const PyTypeObject * type ) {
150
150
// bpo-44378: Don't use Py_TYPE() since Py_TYPE() requires a non-const
151
151
// object.
152
152
return ob -> ob_type == type ;
153
153
}
154
- #define Py_IS_TYPE (ob , type ) _Py_IS_TYPE (_PyObject_CAST_CONST(ob), type)
154
+ #define Py_IS_TYPE (ob , type ) Py_IS_TYPE (_PyObject_CAST_CONST(ob), type)
155
155
156
156
157
- static inline void _Py_SET_REFCNT (PyObject * ob , Py_ssize_t refcnt ) {
157
+ static inline void Py_SET_REFCNT (PyObject * ob , Py_ssize_t refcnt ) {
158
158
ob -> ob_refcnt = refcnt ;
159
159
}
160
- #define Py_SET_REFCNT (ob , refcnt ) _Py_SET_REFCNT (_PyObject_CAST(ob), refcnt)
160
+ #define Py_SET_REFCNT (ob , refcnt ) Py_SET_REFCNT (_PyObject_CAST(ob), refcnt)
161
161
162
162
163
- static inline void _Py_SET_TYPE (PyObject * ob , PyTypeObject * type ) {
163
+ static inline void Py_SET_TYPE (PyObject * ob , PyTypeObject * type ) {
164
164
ob -> ob_type = type ;
165
165
}
166
- #define Py_SET_TYPE (ob , type ) _Py_SET_TYPE (_PyObject_CAST(ob), type)
166
+ #define Py_SET_TYPE (ob , type ) Py_SET_TYPE (_PyObject_CAST(ob), type)
167
167
168
168
169
- static inline void _Py_SET_SIZE (PyVarObject * ob , Py_ssize_t size ) {
169
+ static inline void Py_SET_SIZE (PyVarObject * ob , Py_ssize_t size ) {
170
170
ob -> ob_size = size ;
171
171
}
172
- #define Py_SET_SIZE (ob , size ) _Py_SET_SIZE (_PyVarObject_CAST(ob), size)
172
+ #define Py_SET_SIZE (ob , size ) Py_SET_SIZE (_PyVarObject_CAST(ob), size)
173
173
174
174
175
175
/*
@@ -253,10 +253,10 @@ PyAPI_FUNC(PyObject *) PyType_GetQualName(PyTypeObject *);
253
253
/* Generic type check */
254
254
PyAPI_FUNC (int ) PyType_IsSubtype (PyTypeObject * , PyTypeObject * );
255
255
256
- static inline int _PyObject_TypeCheck (PyObject * ob , PyTypeObject * type ) {
256
+ static inline int PyObject_TypeCheck (PyObject * ob , PyTypeObject * type ) {
257
257
return Py_IS_TYPE (ob , type ) || PyType_IsSubtype (Py_TYPE (ob ), type );
258
258
}
259
- #define PyObject_TypeCheck (ob , type ) _PyObject_TypeCheck (_PyObject_CAST(ob), type)
259
+ #define PyObject_TypeCheck (ob , type ) PyObject_TypeCheck (_PyObject_CAST(ob), type)
260
260
261
261
PyAPI_DATA (PyTypeObject ) PyType_Type ; /* built-in 'type' */
262
262
PyAPI_DATA (PyTypeObject ) PyBaseObject_Type ; /* built-in 'object' */
@@ -475,7 +475,7 @@ PyAPI_FUNC(void) Py_DecRef(PyObject *);
475
475
PyAPI_FUNC (void ) _Py_IncRef (PyObject * );
476
476
PyAPI_FUNC (void ) _Py_DecRef (PyObject * );
477
477
478
- static inline void _Py_INCREF (PyObject * op )
478
+ static inline void Py_INCREF (PyObject * op )
479
479
{
480
480
#if defined(Py_REF_DEBUG ) && defined(Py_LIMITED_API ) && Py_LIMITED_API + 0 >= 0x030A0000
481
481
// Stable ABI for Python 3.10 built in debug mode.
@@ -489,9 +489,9 @@ static inline void _Py_INCREF(PyObject *op)
489
489
op -> ob_refcnt ++ ;
490
490
#endif
491
491
}
492
- #define Py_INCREF (op ) _Py_INCREF (_PyObject_CAST(op))
492
+ #define Py_INCREF (op ) Py_INCREF (_PyObject_CAST(op))
493
493
494
- static inline void _Py_DECREF (
494
+ static inline void Py_DECREF (
495
495
#if defined(Py_REF_DEBUG ) && !(defined (Py_LIMITED_API ) && Py_LIMITED_API + 0 >= 0x030A0000 )
496
496
const char * filename , int lineno ,
497
497
#endif
@@ -519,9 +519,9 @@ static inline void _Py_DECREF(
519
519
#endif
520
520
}
521
521
#if defined(Py_REF_DEBUG ) && !(defined(Py_LIMITED_API ) && Py_LIMITED_API + 0 >= 0x030A0000 )
522
- # define Py_DECREF (op ) _Py_DECREF (__FILE__, __LINE__, _PyObject_CAST(op))
522
+ # define Py_DECREF (op ) Py_DECREF (__FILE__, __LINE__, _PyObject_CAST(op))
523
523
#else
524
- # define Py_DECREF (op ) _Py_DECREF (_PyObject_CAST(op))
524
+ # define Py_DECREF (op ) Py_DECREF (_PyObject_CAST(op))
525
525
#endif
526
526
527
527
@@ -569,23 +569,23 @@ static inline void _Py_DECREF(
569
569
} while (0)
570
570
571
571
/* Function to use in case the object pointer can be NULL: */
572
- static inline void _Py_XINCREF (PyObject * op )
572
+ static inline void Py_XINCREF (PyObject * op )
573
573
{
574
574
if (op != NULL ) {
575
575
Py_INCREF (op );
576
576
}
577
577
}
578
578
579
- #define Py_XINCREF (op ) _Py_XINCREF (_PyObject_CAST(op))
579
+ #define Py_XINCREF (op ) Py_XINCREF (_PyObject_CAST(op))
580
580
581
- static inline void _Py_XDECREF (PyObject * op )
581
+ static inline void Py_XDECREF (PyObject * op )
582
582
{
583
583
if (op != NULL ) {
584
584
Py_DECREF (op );
585
585
}
586
586
}
587
587
588
- #define Py_XDECREF (op ) _Py_XDECREF (_PyObject_CAST(op))
588
+ #define Py_XDECREF (op ) Py_XDECREF (_PyObject_CAST(op))
589
589
590
590
// Create a new strong reference to an object:
591
591
// increment the reference count of the object and return the object.
@@ -750,17 +750,17 @@ PyType_HasFeature(PyTypeObject *type, unsigned long feature)
750
750
751
751
#define PyType_FastSubclass (type , flag ) PyType_HasFeature(type, flag)
752
752
753
- static inline int _PyType_Check (PyObject * op ) {
753
+ static inline int PyType_Check (PyObject * op ) {
754
754
return PyType_FastSubclass (Py_TYPE (op ), Py_TPFLAGS_TYPE_SUBCLASS );
755
755
}
756
- #define PyType_Check (op ) _PyType_Check (_PyObject_CAST(op))
756
+ #define PyType_Check (op ) PyType_Check (_PyObject_CAST(op))
757
757
758
758
#define _PyType_CAST (op ) (assert(PyType_Check(op)), (PyTypeObject*)(op))
759
759
760
- static inline int _PyType_CheckExact (PyObject * op ) {
760
+ static inline int PyType_CheckExact (PyObject * op ) {
761
761
return Py_IS_TYPE (op , & PyType_Type );
762
762
}
763
- #define PyType_CheckExact (op ) _PyType_CheckExact (_PyObject_CAST(op))
763
+ #define PyType_CheckExact (op ) PyType_CheckExact (_PyObject_CAST(op))
764
764
765
765
#ifdef __cplusplus
766
766
}
0 commit comments