Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2013-09-12 12:51:48 +02:00
commit 5f24b1d6d6

View File

@ -85,7 +85,7 @@ end
-- Resync CPP line numbers. -- Resync CPP line numbers.
local function wsync() local function wsync()
if g_synclineno ~= g_lineno and g_opt.cpp then if g_synclineno ~= g_lineno and g_opt.cpp then
wline("# "..g_lineno..' "'..g_fname..'"') wline("#line "..g_lineno..' "'..g_fname..'"')
g_synclineno = g_lineno g_synclineno = g_lineno
end end
end end