Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall
2020-10-12 16:18:02 +02:00
19 changed files with 49 additions and 49 deletions

View File

@@ -6,7 +6,7 @@
**
** This is a version (aka dlmalloc) of malloc/free/realloc written by
** Doug Lea and released to the public domain, as explained at
** http://creativecommons.org/licenses/publicdomain.
** https://creativecommons.org/licenses/publicdomain.
**
** * Version pre-2.8.4 Wed Mar 29 19:46:29 2006 (dl at gee)
**
@@ -16,8 +16,8 @@
** If you want to use dlmalloc in another project, you should get
** the original from: ftp://gee.cs.oswego.edu/pub/misc/
** For thread-safe derivatives, take a look at:
** - ptmalloc: http://www.malloc.de/
** - nedmalloc: http://www.nedprod.com/programs/portable/nedmalloc/
** - ptmalloc: https://www.malloc.de/
** - nedmalloc: https://www.nedprod.com/programs/portable/nedmalloc/
*/
#define lj_alloc_c