anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-25 09:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enable compilation on various platforms.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9849 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2005-04-21 14:03:30 +00:00
parent a2f413c035
commit ce286c29ba
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/support/ChangeLog
View File

@ -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> 2005-04-19 Angus Leeming <leeming@lyx.org>
* filetools.C: remove unnecessary #include of forkedcontr.h. * filetools.C: remove unnecessary #include of forkedcontr.h.

13
src/support/filetools.C
View File

@ -43,9 +43,9 @@
#include <fcntl.h> #include <fcntl.h>
#include <cctype> #include <cctype>
#include <cerrno>
#include <cstdlib> #include <cstdlib>
#include <cstdio> #include <cstdio>
#include <cerrno>
#include <utility> #include <utility>
#include <fstream> #include <fstream>
@ -1061,14 +1061,6 @@ cmd_ret const RunCommand(string const & cmd)
// pstream (process stream), with the // pstream (process stream), with the
// variants ipstream, opstream // 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()); FILE * inf = ::popen(cmd.c_str(), os::popen_read_mode());
// (Claus Hentschel) Check if popen was succesful ;-) // (Claus Hentschel) Check if popen was succesful ;-)
@ -1087,9 +1079,6 @@ cmd_ret const RunCommand(string const & cmd)
if (pret == -1) if (pret == -1)
perror("RunCommand:: could not terminate child process"); 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); return make_pair(pret, ret);
} }

1
src/support/forkedcontr.C
View File

@ -25,6 +25,7 @@
#else #else
# include <cerrno> # include <cerrno>
# include <csignal>
# include <cstdlib> # include <cstdlib>
# include <unistd.h> # include <unistd.h>
# include <sys/wait.h> # include <sys/wait.h>