Merge branch 'master' into v2.1

2016-07-17 14:38:26 +02:00
parent 01e4754962 1914de71c7
commit 37b377dedf
7 changed files with 13 additions and 13 deletions
--- a/src/host/genminilua.lua
+++ b/src/host/genminilua.lua
@@ -157,11 +157,11 @@ local function merge_includes(src)
    if includes[name] then return "" end
    includes[name] = true
    local fp = assert(io.open(LUA_SOURCE..name, "r"))
-    local src = fp:read("*a")
+    local inc = fp:read("*a")
    assert(fp:close())
-    src = gsub(src, "#ifndef%s+%w+_h\n#define%s+%w+_h\n", "")
-    src = gsub(src, "#endif%s*$", "")
-    return merge_includes(src)
+    inc = gsub(inc, "#ifndef%s+%w+_h\n#define%s+%w+_h\n", "")
+    inc = gsub(inc, "#endif%s*$", "")
+    return merge_includes(inc)
  end)
 end