diff options
| author | Mike Pall <mike> | 2018-01-29 13:19:30 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2018-01-29 13:19:30 +0100 |
| commit | 0bf46e1edf94c43795b5e491efe682ab70974ce7 (patch) | |
| tree | 5e96ce2da5161ebd49fb564fe5aa73805b3391b7 /src/luajit.c | |
| parent | 74c544d68c07bcd416225598cdf15f88e62fd457 (diff) | |
| parent | d4ee80342770d1281e2ce877f8ae8ab1d99e6528 (diff) | |
| download | luajit-0bf46e1edf94c43795b5e491efe682ab70974ce7.tar.gz luajit-0bf46e1edf94c43795b5e491efe682ab70974ce7.tar.bz2 luajit-0bf46e1edf94c43795b5e491efe682ab70974ce7.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/luajit.c')
| -rw-r--r-- | src/luajit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/luajit.c b/src/luajit.c index 1ca24301..3a3ec247 100644 --- a/src/luajit.c +++ b/src/luajit.c | |||
| @@ -421,6 +421,7 @@ static int collectargs(char **argv, int *flags) | |||
| 421 | break; | 421 | break; |
| 422 | case 'e': | 422 | case 'e': |
| 423 | *flags |= FLAGS_EXEC; | 423 | *flags |= FLAGS_EXEC; |
| 424 | /* fallthrough */ | ||
| 424 | case 'j': /* LuaJIT extension */ | 425 | case 'j': /* LuaJIT extension */ |
| 425 | case 'l': | 426 | case 'l': |
| 426 | *flags |= FLAGS_OPTION; | 427 | *flags |= FLAGS_OPTION; |