diff options
| author | Mike Pall <mike> | 2013-10-10 14:34:39 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-10-10 14:34:39 +0200 |
| commit | 4ccb2dd3bb576f742f987cf0027214e733325404 (patch) | |
| tree | 39ae03aa0d7a520bac236872cc5b9f486c9859db /src | |
| parent | 1837d070822b10c44a3c473844cdcb102b4af70a (diff) | |
| parent | 3cdeb54a24047d1402a0c2d795888c0791f9157d (diff) | |
| download | luajit-4ccb2dd3bb576f742f987cf0027214e733325404.tar.gz luajit-4ccb2dd3bb576f742f987cf0027214e733325404.tar.bz2 luajit-4ccb2dd3bb576f742f987cf0027214e733325404.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -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 42eb2e43..b381bba1 100644 --- a/src/lj_alloc.c +++ b/src/lj_alloc.c | |||
| @@ -177,7 +177,7 @@ static LJ_AINLINE int CALL_MUNMAP(void *ptr, size_t size) | |||
| 177 | #if LJ_64 | 177 | #if LJ_64 |
| 178 | /* 64 bit mode needs special support for allocating memory in the lower 2GB. */ | 178 | /* 64 bit mode needs special support for allocating memory in the lower 2GB. */ |
| 179 | 179 | ||
| 180 | #if LJ_TARGET_LINUX | 180 | #if defined(MAP_32BIT) |
| 181 | 181 | ||
| 182 | /* Actually this only gives us max. 1GB in current Linux kernels. */ | 182 | /* Actually this only gives us max. 1GB in current Linux kernels. */ |
| 183 | static LJ_AINLINE void *CALL_MMAP(size_t size) | 183 | static LJ_AINLINE void *CALL_MMAP(size_t size) |