diff options
| author | Mike Pall <mike> | 2013-09-12 12:51:48 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-09-12 12:51:48 +0200 |
| commit | 5f24b1d6d6d5e05aa6aafb9f06fb459bb56e0074 (patch) | |
| tree | 095f5bf221c88fdc94714048676db53b39fddc88 | |
| parent | 0953b9a72d7247650b1eec4b0c6590254578e6a5 (diff) | |
| parent | 1f7b32621700a7c104435a64d6cad5374cb8b9b7 (diff) | |
| download | luajit-5f24b1d6d6d5e05aa6aafb9f06fb459bb56e0074.tar.gz luajit-5f24b1d6d6d5e05aa6aafb9f06fb459bb56e0074.tar.bz2 luajit-5f24b1d6d6d5e05aa6aafb9f06fb459bb56e0074.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to '')
| -rw-r--r-- | dynasm/dynasm.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dynasm/dynasm.lua b/dynasm/dynasm.lua index d670f8f8..3d04dcf8 100644 --- a/dynasm/dynasm.lua +++ b/dynasm/dynasm.lua | |||
| @@ -85,7 +85,7 @@ end | |||
| 85 | -- Resync CPP line numbers. | 85 | -- Resync CPP line numbers. |
| 86 | local function wsync() | 86 | local function wsync() |
| 87 | if g_synclineno ~= g_lineno and g_opt.cpp then | 87 | if g_synclineno ~= g_lineno and g_opt.cpp then |
| 88 | wline("# "..g_lineno..' "'..g_fname..'"') | 88 | wline("#line "..g_lineno..' "'..g_fname..'"') |
| 89 | g_synclineno = g_lineno | 89 | g_synclineno = g_lineno |
| 90 | end | 90 | end |
| 91 | end | 91 | end |