@@ -2100,7 +2100,7 @@ float_compactlong_guard(PyObject *lhs, PyObject *rhs)
21002100{
21012101 return (
21022102 PyFloat_CheckExact (lhs ) &&
2103- !isnan (PyFloat_AsDouble (lhs )) &&
2103+ !isnan (PyFloat_AS_DOUBLE (lhs )) &&
21042104 PyLong_CheckExact (rhs ) &&
21052105 _PyLong_IsCompact ((PyLongObject * )rhs )
21062106 );
@@ -2110,15 +2110,15 @@ static inline int
21102110nonzero_float_compactlong_guard (PyObject * lhs , PyObject * rhs )
21112111{
21122112 return (
2113- float_compactlong_guard (lhs , rhs ) && !PyLong_IsZero ( rhs )
2113+ float_compactlong_guard (lhs , rhs ) && !_PyLong_IsZero (( PyLongObject * ) rhs )
21142114 );
21152115}
21162116
21172117#define FLOAT_LONG_ACTION (NAME , OP ) \
21182118 static PyObject * \
21192119 (NAME )(PyObject * lhs , PyObject * rhs ) \
21202120 { \
2121- double lhs_val = PyFloat_AsDouble (lhs ); \
2121+ double lhs_val = PyFloat_AS_DOUBLE (lhs ); \
21222122 Py_ssize_t rhs_val = _PyLong_CompactValue ((PyLongObject * )rhs ); \
21232123 return PyFloat_FromDouble (lhs_val OP rhs_val ); \
21242124 }
@@ -2137,23 +2137,23 @@ compactlong_float_guard(PyObject *lhs, PyObject *rhs)
21372137 PyLong_CheckExact (lhs ) &&
21382138 _PyLong_IsCompact ((PyLongObject * )lhs ) &&
21392139 PyFloat_CheckExact (rhs ) &&
2140- !isnan (PyFloat_AsDouble (rhs ))
2140+ !isnan (PyFloat_AS_DOUBLE (rhs ))
21412141 );
21422142}
21432143
21442144static inline int
21452145nonzero_compactlong_float_guard (PyObject * lhs , PyObject * rhs )
21462146{
21472147 return (
2148- compactlong_float_guard (lhs , rhs ) && PyFloat_AsDouble (rhs ) != 0.0
2148+ compactlong_float_guard (lhs , rhs ) && PyFloat_AS_DOUBLE (rhs ) != 0.0
21492149 );
21502150}
21512151
21522152#define LONG_FLOAT_ACTION (NAME , OP ) \
21532153 static PyObject * \
21542154 (NAME )(PyObject * lhs , PyObject * rhs ) \
21552155 { \
2156- double rhs_val = PyFloat_AsDouble (rhs ); \
2156+ double rhs_val = PyFloat_AS_DOUBLE (rhs ); \
21572157 Py_ssize_t lhs_val = _PyLong_CompactValue ((PyLongObject * )lhs ); \
21582158 return PyFloat_FromDouble (lhs_val OP rhs_val ); \
21592159 }
0 commit comments