diff options
| author | Mike Pall <mike> | 2016-04-03 19:08:32 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2016-04-03 19:08:32 +0200 |
| commit | 25b377942ab2707422167d5f04732bb7d6806f58 (patch) | |
| tree | 97569531ff81e2473b7bd60a68ef765a92e9584f /src/lj_alloc.c | |
| parent | 296f0ca8d7c063cca1b6ddc0a48ceddff09d53b1 (diff) | |
| parent | 4ab6367b21527a20b76ce356153bc454e082b7d2 (diff) | |
| download | luajit-25b377942ab2707422167d5f04732bb7d6806f58.tar.gz luajit-25b377942ab2707422167d5f04732bb7d6806f58.tar.bz2 luajit-25b377942ab2707422167d5f04732bb7d6806f58.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 ddd50cae..32de45ec 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__) || defined(__CYGWIN__) | 199 | #elif LJ_TARGET_OSX || LJ_TARGET_PS4 || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__sun__) || LJ_TARGET_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, |