diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-01-29 22:49:45 +0100 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-01-29 23:00:17 +0100 |
commit | 406e7a0a47110adbf79326c8a0bda5ffac3e0f10 (patch) | |
tree | 018657c3ab95f19aeb2fcc4a772f362676d3d26e /ChangeLog | |
parent | 2aadb70562feae948ed093c86808e7331c5bc6bd (diff) | |
download | glibc-406e7a0a47110adbf79326c8a0bda5ffac3e0f10.tar glibc-406e7a0a47110adbf79326c8a0bda5ffac3e0f10.tar.gz glibc-406e7a0a47110adbf79326c8a0bda5ffac3e0f10.tar.bz2 glibc-406e7a0a47110adbf79326c8a0bda5ffac3e0f10.zip |
malloc: Use assert.h's assert macro
This avoids assert definition conflicts if some of the headers used by
malloc.c happens to include assert.h. Malloc still needs a malloc-avoiding
implementation, which we get by redirecting __assert_fail to malloc's
__malloc_assert.
* malloc/malloc.c: Include <assert.h>.
(assert): Do not define.
[!defined NDEBUG] (__assert_fail): Define to __malloc_assert.
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -23,6 +23,9 @@ || to respect codestyle. * libio/tst-memstream3.c (_FWRITE): Rename to FWRITE_FUNC. (do_test_bz20181): Rename accordingly. + * malloc/malloc.c: Include <assert.h>. + (assert): Do not define. + [!defined NDEBUG] (__assert_fail): Define to __malloc_assert. 2018-01-29 Darius Rad <darius@bluespec.com> |