summaryrefslogtreecommitdiff
path: root/Build/source/utils/asymptote/picture.cc
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-05-31 00:02:26 +0000
committerKarl Berry <karl@freefriends.org>2012-05-31 00:02:26 +0000
commit19fc9fd9a26973d87fad437ce549ffaba479df54 (patch)
treef40a9d2592b3cf827970c8bf54a1eebf9cc8f9c0 /Build/source/utils/asymptote/picture.cc
parent24b3bac312553b2cc61e94fda581aba311967f5c (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/picture.cc')
-rw-r--r--Build/source/utils/asymptote/picture.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/Build/source/utils/asymptote/picture.cc b/Build/source/utils/asymptote/picture.cc
index c11e6e93ae0..9a77cd4d592 100644
--- a/Build/source/utils/asymptote/picture.cc
+++ b/Build/source/utils/asymptote/picture.cc
@@ -248,7 +248,7 @@ void texinit()
name=stripExt(name).substr(0,pos);
unlink((name+".aux").c_str());
cmd.push_back("-jobname="+name.substr(0,pos));
-#ifdef __CYGWIN__
+#ifdef __MSDOS__
cmd.push_back("NUL"); // For MikTeX
#endif
}
@@ -966,7 +966,7 @@ Communicate com;
void glrenderWrapper()
{
#ifdef HAVE_GL
-#ifdef HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD
wait(initSignal,initLock);
endwait(initSignal,initLock);
#endif
@@ -1012,13 +1012,15 @@ bool picture::shipout3(const string& prefix, const string& format,
#ifdef HAVE_GL
bool View=settings::view() && view;
static int oldpid=0;
+#ifdef HAVE_PTHREAD
bool animating=getSetting<bool>("animating");
bool Wait=!interact::interactive || !View || animating;
#endif
+#endif
-#ifdef HAVE_LIBGLUT
+#if defined(HAVE_LIBGLUT) && defined(HAVE_GL)
if(glthread && !offscreen) {
-#ifdef HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD
if(gl::initialize) {
gl::initialize=false;
com.prefix=prefix;
@@ -1074,7 +1076,7 @@ bool picture::shipout3(const string& prefix, const string& format,
glrender(prefix,this,outputformat,width,height,angle,zoom,m,M,shift,t,
background,nlights,lights,diffuse,ambient,specular,viewportlighting,
View,oldpid);
-#ifdef HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD
if(glthread && !offscreen && Wait) {
pthread_cond_wait(&readySignal,&readyLock);
pthread_mutex_unlock(&readyLock);