diff options
| author | T. Wouters <thomas@python.org> | 2017-03-31 16:14:41 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-31 16:14:41 (GMT) |
| commit | a00c3fd12d421e41b769debd7df717d17b0deed5 (patch) | |
| tree | f25a9a879cbdda7216326adf84a0a54dca20ad3b /Include/unicodeobject.h | |
| parent | 164d30eb1e66575dafee6af4fca4cbf52c7fbe6a (diff) | |
| download | cpython-a00c3fd12d421e41b769debd7df717d17b0deed5.zip cpython-a00c3fd12d421e41b769debd7df717d17b0deed5.tar.gz cpython-a00c3fd12d421e41b769debd7df717d17b0deed5.tar.bz2 | |
bpo-29941: Assert fixes (#886)
Make a non-Py_DEBUG, asserts-enabled build of CPython possible. This means
making sure helper functions are defined when NDEBUG is not defined, not
just when Py_DEBUG is defined.
Also fix a division-by-zero in obmalloc.c that went unnoticed because in Py_DEBUG mode, elsize is never zero.
Diffstat (limited to 'Include/unicodeobject.h')
| -rw-r--r-- | Include/unicodeobject.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index c3d0516..0d10c71 100644 --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -2313,6 +2313,10 @@ PyAPI_FUNC(Py_UNICODE*) PyUnicode_AsUnicodeCopy( PyAPI_FUNC(int) _PyUnicode_CheckConsistency( PyObject *op, int check_content); +#elif !defined(NDEBUG) +/* For asserts that call _PyUnicode_CheckConsistency(), which would + * otherwise be a problem when building with asserts but without Py_DEBUG. */ +#define _PyUnicode_CheckConsistency(op, check_content) PyUnicode_Check(op) #endif #ifndef Py_LIMITED_API |