diff options
| author | Mike Pall <mike> | 2015-09-20 19:18:31 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2015-09-20 19:18:31 +0200 |
| commit | 49427dfcc2bb9ac60cd6023a59b0f788fcd38c3c (patch) | |
| tree | 2e3482d7b82fedb861d219fc51607d3c9ca63c9d /src/lj_alloc.c | |
| parent | 55c3b29f7b20f3801848e0ab71e9de1d22207b95 (diff) | |
| parent | 076d625dc6046c5f05d55a95d3b9afd5637d5a5a (diff) | |
| download | luajit-49427dfcc2bb9ac60cd6023a59b0f788fcd38c3c.tar.gz luajit-49427dfcc2bb9ac60cd6023a59b0f788fcd38c3c.tar.bz2 luajit-49427dfcc2bb9ac60cd6023a59b0f788fcd38c3c.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_alloc.c')
| -rw-r--r-- | src/lj_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_alloc.c b/src/lj_alloc.c index 0aad826d..ddd50cae 100644 --- a/src/lj_alloc.c +++ b/src/lj_alloc.c | |||
| @@ -196,7 +196,7 @@ static LJ_AINLINE void *CALL_MMAP(size_t size) | |||
| 196 | return ptr; | 196 | return ptr; |
| 197 | } | 197 | } |
| 198 | 198 | ||
| 199 | #elif LJ_TARGET_OSX || LJ_TARGET_PS4 || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__sun__) | 199 | #elif LJ_TARGET_OSX || LJ_TARGET_PS4 || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__sun__) || defined(__CYGWIN__) |
| 200 | 200 | ||
| 201 | /* OSX and FreeBSD mmap() use a naive first-fit linear search. | 201 | /* OSX and FreeBSD mmap() use a naive first-fit linear search. |
| 202 | ** That's perfect for us. Except that -pagezero_size must be set for OSX, | 202 | ** That's perfect for us. Except that -pagezero_size must be set for OSX, |