diff options
| author | Mike Pall <mike> | 2013-07-17 11:06:31 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-07-17 11:06:31 +0200 |
| commit | dd44018d6629cd43366ae47a0a227ffbf63722f2 (patch) | |
| tree | 905d16a68a58535644ff98d85d2cbf456322e8eb | |
| parent | 146807b7e82a8a5b9999928c4a767f1d0db11b82 (diff) | |
| parent | 9aa5d04137f9ba2f279eb0aebb0a4ba98e6ea2b3 (diff) | |
| download | luajit-dd44018d6629cd43366ae47a0a227ffbf63722f2.tar.gz luajit-dd44018d6629cd43366ae47a0a227ffbf63722f2.tar.bz2 luajit-dd44018d6629cd43366ae47a0a227ffbf63722f2.zip | |
Merge branch 'master' into v2.1
| -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 8f285d17..42eb2e43 100644 --- a/src/lj_alloc.c +++ b/src/lj_alloc.c | |||
| @@ -188,7 +188,7 @@ static LJ_AINLINE void *CALL_MMAP(size_t size) | |||
| 188 | return ptr; | 188 | return ptr; |
| 189 | } | 189 | } |
| 190 | 190 | ||
| 191 | #elif LJ_TARGET_OSX || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__sun__) | 191 | #elif LJ_TARGET_OSX || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sun__) |
| 192 | 192 | ||
| 193 | /* OSX and FreeBSD mmap() use a naive first-fit linear search. | 193 | /* OSX and FreeBSD mmap() use a naive first-fit linear search. |
| 194 | ** That's perfect for us. Except that -pagezero_size must be set for OSX, | 194 | ** That's perfect for us. Except that -pagezero_size must be set for OSX, |