diff options
| author | Mike Pall <mike> | 2014-04-22 11:29:05 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-04-22 11:29:05 +0200 |
| commit | c8d1aff0bafcbfadb4a119685708c19788158cd6 (patch) | |
| tree | 9501d4b89549058b727c386aac980da075df4995 /src/lib_aux.c | |
| parent | 39acdb8b7f8542373d6a47538f9a712baa8fe7d6 (diff) | |
| parent | 2715fe3aee7c8202b4b5d04748d1c5faa6d8fd9c (diff) | |
| download | luajit-c8d1aff0bafcbfadb4a119685708c19788158cd6.tar.gz luajit-c8d1aff0bafcbfadb4a119685708c19788158cd6.tar.bz2 luajit-c8d1aff0bafcbfadb4a119685708c19788158cd6.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lib_aux.c')
| -rw-r--r-- | src/lib_aux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib_aux.c b/src/lib_aux.c index 1b01fe07..e88dc7c2 100644 --- a/src/lib_aux.c +++ b/src/lib_aux.c | |||
| @@ -302,7 +302,7 @@ static int panic(lua_State *L) | |||
| 302 | 302 | ||
| 303 | #ifdef LUAJIT_USE_SYSMALLOC | 303 | #ifdef LUAJIT_USE_SYSMALLOC |
| 304 | 304 | ||
| 305 | #if LJ_64 | 305 | #if LJ_64 && !defined(LUAJIT_USE_VALGRIND) |
| 306 | #error "Must use builtin allocator for 64 bit target" | 306 | #error "Must use builtin allocator for 64 bit target" |
| 307 | #endif | 307 | #endif |
| 308 | 308 | ||