diff options
author | Karl Berry <karl@freefriends.org> | 2012-05-31 00:02:26 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-05-31 00:02:26 +0000 |
commit | 19fc9fd9a26973d87fad437ce549ffaba479df54 (patch) | |
tree | f40a9d2592b3cf827970c8bf54a1eebf9cc8f9c0 /Build/source/utils/asymptote/main.cc | |
parent | 24b3bac312553b2cc61e94fda581aba311967f5c (diff) |
asy 2.16 sources
git-svn-id: svn://tug.org/texlive/trunk@26734 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/asymptote/main.cc')
-rw-r--r-- | Build/source/utils/asymptote/main.cc | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/Build/source/utils/asymptote/main.cc b/Build/source/utils/asymptote/main.cc index c437a06e530..e38f7c28e10 100644 --- a/Build/source/utils/asymptote/main.cc +++ b/Build/source/utils/asymptote/main.cc @@ -27,10 +27,6 @@ #include "common.h" -#ifdef __CYGWIN__ -#define NOMINMAX -#endif - #ifdef HAVE_LIBSIGSEGV #include <sigsegv.h> #endif @@ -46,7 +42,6 @@ using namespace settings; -errorstream em; using interact::interactive; namespace run { @@ -108,20 +103,6 @@ void interruptHandler(int) em.Interrupt(true); } -// Run the config file. -void doConfig(string file) -{ - bool autoplain=getSetting<bool>("autoplain"); - bool listvariables=getSetting<bool>("listvariables"); - if(autoplain) Setting("autoplain")=false; // Turn off for speed. - if(listvariables) Setting("listvariables")=false; - - runFile(file); - - if(autoplain) Setting("autoplain")=true; - if(listvariables) Setting("listvariables")=true; -} - struct Args { int argc; @@ -189,13 +170,17 @@ int main(int argc, char *argv[]) Args args(argc,argv); #ifdef HAVE_GL gl::glthread=getSetting<bool>("threads"); -#if HAVE_LIBPTHREAD +#if HAVE_PTHREAD if(gl::glthread) { pthread_t thread; try { if(pthread_create(&thread,NULL,asymain,&args) == 0) { gl::mainthread=pthread_self(); + sigset_t set; + sigemptyset(&set); + sigaddset(&set, SIGCHLD); + pthread_sigmask(SIG_BLOCK, &set, NULL); while(true) { camp::glrenderWrapper(); gl::initialize=true; |