Portability: Updated to make main re-entrant()
- New INSTALL instructions to emscripten, and AUTHORS for contribution.
This commit is contained in:
committed by
Paul Beckingham
parent
cae3f06b7d
commit
7af6db4c17
@@ -30,8 +30,6 @@
|
||||
#include <Filter.h>
|
||||
#include <main.h>
|
||||
|
||||
extern Context context;
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
CmdExport::CmdExport ()
|
||||
{
|
||||
@@ -68,11 +66,11 @@ int CmdExport::execute (std::string& output)
|
||||
// Obey 'limit:N'.
|
||||
int rows = 0;
|
||||
int lines = 0;
|
||||
context.getLimits (rows, lines);
|
||||
Context::getContext ().getLimits (rows, lines);
|
||||
int limit = (rows > lines ? rows : lines);
|
||||
|
||||
// Is output contained within a JSON array?
|
||||
bool json_array = context.config.getBoolean ("json.array");
|
||||
bool json_array = Context::getContext ().config.getBoolean ("json.array");
|
||||
|
||||
// Compose output.
|
||||
if (json_array)
|
||||
@@ -101,7 +99,7 @@ int CmdExport::execute (std::string& output)
|
||||
if (json_array)
|
||||
output += "]\n";
|
||||
|
||||
context.time_render_us += timer.total_us ();
|
||||
Context::getContext ().time_render_us += timer.total_us ();
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user