From: Angus Leeming <leeming@lyx.org>
Date: Thu, 21 Apr 2005 14:03:30 +0000 (+0000)
Subject: Enable compilation on various platforms.
X-Git-Tag: 1.6.10~14370
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ce286c29ba258eea772bdc834aba8c512417fb52;p=features.git

Enable compilation on various platforms.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9849 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 6279bd1afd..462269bfc5 100644
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-21  Angus Leeming  <leeming@lyx.org>
+
+	* forkedcontr.C: add #include <csignal>.
+
+	* filetools.C (RunCommand): remove the signal blocking stuff
+	now that we no longer use a signal handler on unix.
+
 2005-04-19  Angus Leeming  <leeming@lyx.org>
 
 	* filetools.C: remove unnecessary #include of forkedcontr.h.
diff --git a/src/support/filetools.C b/src/support/filetools.C
index 3cc0880f67..6bdc9336ab 100644
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -43,9 +43,9 @@
 #include <fcntl.h>
 
 #include <cctype>
+#include <cerrno>
 #include <cstdlib>
 #include <cstdio>
-#include <cerrno>
 
 #include <utility>
 #include <fstream>
@@ -1061,14 +1061,6 @@ cmd_ret const RunCommand(string const & cmd)
 	// pstream (process stream), with the
 	// variants ipstream, opstream
 
-	sigset_t newMask, oldMask;
-	sigemptyset(&oldMask);
-	sigemptyset(&newMask);
-	sigaddset(&newMask, SIGCHLD);
-
-	// Block the SIGCHLD signal.
-	sigprocmask(SIG_BLOCK, &newMask, &oldMask);
-
 	FILE * inf = ::popen(cmd.c_str(), os::popen_read_mode());
 
 	// (Claus Hentschel) Check if popen was succesful ;-)
@@ -1087,9 +1079,6 @@ cmd_ret const RunCommand(string const & cmd)
 	if (pret == -1)
 		perror("RunCommand:: could not terminate child process");
 
-	// Unblock the SIGCHLD signal and restore the old mask.
-	sigprocmask(SIG_SETMASK, &oldMask, 0);
-
 	return make_pair(pret, ret);
 }
 
diff --git a/src/support/forkedcontr.C b/src/support/forkedcontr.C
index 0a16b76d05..3dd158c3b3 100644
--- a/src/support/forkedcontr.C
+++ b/src/support/forkedcontr.C
@@ -25,6 +25,7 @@
 
 #else
 # include <cerrno>
+# include <csignal>
 # include <cstdlib>
 # include <unistd.h>
 # include <sys/wait.h>