diff options
| author | Mike Pall <mike> | 2016-07-17 14:38:26 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2016-07-17 14:38:26 +0200 |
| commit | 37b377dedf000cb78730feff1035d439d04ce09e (patch) | |
| tree | 65f110c3396e0e7bc607287a54ff9b3f90d308a6 /src/host | |
| parent | 01e4754962130dc85802a9738707d7fdb76c879c (diff) | |
| parent | 1914de71c7dc10c502ecf033c63665eb6d3e6433 (diff) | |
| download | luajit-37b377dedf000cb78730feff1035d439d04ce09e.tar.gz luajit-37b377dedf000cb78730feff1035d439d04ce09e.tar.bz2 luajit-37b377dedf000cb78730feff1035d439d04ce09e.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/host')
| -rw-r--r-- | src/host/genminilua.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/host/genminilua.lua b/src/host/genminilua.lua index e9a68297..16a81a23 100644 --- a/src/host/genminilua.lua +++ b/src/host/genminilua.lua | |||
| @@ -157,11 +157,11 @@ local function merge_includes(src) | |||
| 157 | if includes[name] then return "" end | 157 | if includes[name] then return "" end |
| 158 | includes[name] = true | 158 | includes[name] = true |
| 159 | local fp = assert(io.open(LUA_SOURCE..name, "r")) | 159 | local fp = assert(io.open(LUA_SOURCE..name, "r")) |
| 160 | local src = fp:read("*a") | 160 | local inc = fp:read("*a") |
| 161 | assert(fp:close()) | 161 | assert(fp:close()) |
| 162 | src = gsub(src, "#ifndef%s+%w+_h\n#define%s+%w+_h\n", "") | 162 | inc = gsub(inc, "#ifndef%s+%w+_h\n#define%s+%w+_h\n", "") |
| 163 | src = gsub(src, "#endif%s*$", "") | 163 | inc = gsub(inc, "#endif%s*$", "") |
| 164 | return merge_includes(src) | 164 | return merge_includes(inc) |
| 165 | end) | 165 | end) |
| 166 | end | 166 | end |
| 167 | 167 | ||