diff options
| author | Mike Pall <mike> | 2020-10-12 16:18:02 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2020-10-12 16:18:02 +0200 |
| commit | 1d8b747c161db457e032a023ebbff511f5de5ec2 (patch) | |
| tree | 7254328c720b104f5d5b4bd8321cfcb18c6fb6ce /src/lj_alloc.c | |
| parent | 675e08cf069725a004284b4e1e67fbf0e8fcb4dd (diff) | |
| parent | 050466552bf7eb8b7944aa52c93b45326ae14d7a (diff) | |
| download | luajit-1d8b747c161db457e032a023ebbff511f5de5ec2.tar.gz luajit-1d8b747c161db457e032a023ebbff511f5de5ec2.tar.bz2 luajit-1d8b747c161db457e032a023ebbff511f5de5ec2.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_alloc.c')
| -rw-r--r-- | src/lj_alloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lj_alloc.c b/src/lj_alloc.c index 5de60b82..21fb7af5 100644 --- a/src/lj_alloc.c +++ b/src/lj_alloc.c | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | ** | 6 | ** |
| 7 | ** This is a version (aka dlmalloc) of malloc/free/realloc written by | 7 | ** This is a version (aka dlmalloc) of malloc/free/realloc written by |
| 8 | ** Doug Lea and released to the public domain, as explained at | 8 | ** Doug Lea and released to the public domain, as explained at |
| 9 | ** http://creativecommons.org/licenses/publicdomain. | 9 | ** https://creativecommons.org/licenses/publicdomain. |
| 10 | ** | 10 | ** |
| 11 | ** * Version pre-2.8.4 Wed Mar 29 19:46:29 2006 (dl at gee) | 11 | ** * Version pre-2.8.4 Wed Mar 29 19:46:29 2006 (dl at gee) |
| 12 | ** | 12 | ** |
| @@ -16,8 +16,8 @@ | |||
| 16 | ** If you want to use dlmalloc in another project, you should get | 16 | ** If you want to use dlmalloc in another project, you should get |
| 17 | ** the original from: ftp://gee.cs.oswego.edu/pub/misc/ | 17 | ** the original from: ftp://gee.cs.oswego.edu/pub/misc/ |
| 18 | ** For thread-safe derivatives, take a look at: | 18 | ** For thread-safe derivatives, take a look at: |
| 19 | ** - ptmalloc: http://www.malloc.de/ | 19 | ** - ptmalloc: https://www.malloc.de/ |
| 20 | ** - nedmalloc: http://www.nedprod.com/programs/portable/nedmalloc/ | 20 | ** - nedmalloc: https://www.nedprod.com/programs/portable/nedmalloc/ |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #define lj_alloc_c | 23 | #define lj_alloc_c |