diff options
| author | Hans Hagen <pragma@wxs.nl> | 2017-02-18 13:39:16 +0100 |
|---|---|---|
| committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2017-02-18 13:39:16 +0100 |
| commit | 601e63e757d4cf40d5923cee4b6b3debff57364c (patch) | |
| tree | 90d3a5f505508efd67ca33b3c157c59d797bb989 /tex/generic | |
| parent | fcd7cdd22ff42dab791f9f825b642caa3cc63300 (diff) | |
| download | context-601e63e757d4cf40d5923cee4b6b3debff57364c.tar.gz | |
2017-02-18 11:52:00
Diffstat (limited to 'tex/generic')
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 952ed19ac..8df4c966b 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 02/17/17 13:41:40 +-- merge date : 02/18/17 11:47:12 do -- begin closure to overcome local limits and interference @@ -108,17 +108,15 @@ if flush then local spawn=os.spawn if spawn then function os.spawn (...) flush() return spawn (...) end end local popen=io.popen if popen then function io.popen (...) flush() return popen (...) end end end -if ffi and ffi.number then -else - local okay - okay,ffi=pcall(require,"ffi") - if not ffi then - elseif ffi.os=="" or ffi.arch=="" then - ffi=nil - elseif ffi.number then - else - ffi.number=tonumber - end +FFISUPPORTED=type(ffi)=="table" and ffi.os~="" and ffi.arch~="" and ffi.load +if not FFISUPPORTED then + local okay;okay,ffi=pcall(require,"ffi") + FFISUPPORTED=type(ffi)=="table" and ffi.os~="" and ffi.arch~="" and ffi.load +end +if not FFISUPPORTED then + ffi=nil +elseif not ffi.number then + ffi.number=tonumber end end -- closure |