Merge branch 'master' into v2.1

2013-09-12 12:51:48 +02:00
parent 0953b9a72d 1f7b326217
commit 5f24b1d6d6
1 changed files with 1 additions and 1 deletions
--- a/dynasm/dynasm.lua
+++ b/dynasm/dynasm.lua
@@ -85,7 +85,7 @@ end
 -- Resync CPP line numbers.
 local function wsync()
  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
  end
 end