#include <boost/bind.hpp>
#include <vector>
+#include <cerrno>
#ifdef _WIN32
# define SIGHUP 1
# include <windows.h>
#else
-# include <cerrno>
# include <csignal>
# include <cstdlib>
-# include <unistd.h>
-# include <sys/types.h>
+# ifdef HAVE_UNISTD_H
+# include <unistd.h>
+# endif
# include <sys/wait.h>
#endif
return;
}
- int const tolerance = std::max(0, tol);
+ // The weird (std::max)(a,b) signature prevents expansion
+ // of an evil MSVC macro.
+ int const tolerance = (std::max)(0, tol);
if (tolerance == 0) {
// Kill it dead NOW!
Murder::killItDead(0, pid());
lyxerr << "</command>" << std::endl;
}
-#if defined (__EMX__)
- pid_t const cpid = spawnvp(P_SESSION|P_DEFAULT|P_MINIMIZE|P_BACKGROUND,
- argv[0], &*argv.begin());
-#elif defined (_WIN32)
- pid_t const cpid = spawnvp(_P_NOWAIT, argv[0], &*argv.begin());
+#ifdef _WIN32
+ pid_t const cpid = spawnvp(_P_NOWAIT, argv[0], &*argv.begin());
#else // POSIX
pid_t const cpid = ::fork();
if (cpid == 0) {