lyxserver cleanup patch + andre's small patches

[lyx.git] / src / support / syscall.C

diff --git a/src/support/syscall.C b/src/support/syscall.C
index f308f770f49eea03ac249d3dc2bb841f5cb06d2d..60afc4293545cf498a58119a2240b5497e49452d 100644 (file)
--- a/src/support/syscall.C
+++ b/src/support/syscall.C
@@ -20,6 +20,10 @@
 
 using std::endl;
 
+#ifndef CXX_GLOBAL_CSTD
+using std::strerror;
+#endif
+
 
 Systemcalls::Systemcalls() {
        pid = 0; // No child yet
@@ -111,7 +115,7 @@ void Systemcalls::waitForChild() {
                pid_t waitrpid = waitpid(pid, &status, WUNTRACED);
                if (waitrpid == -1) {
                        lyxerr << "LyX: Error waiting for child:"
-                              << std::strerror(errno) << endl;
+                              << strerror(errno) << endl;
                        wait = false;
                } else if (WIFEXITED(status)) {
                        // Child exited normally. Update return value.
@@ -178,14 +182,14 @@ pid_t Systemcalls::fork()
                execvp(syscmd, argv);
                // If something goes wrong, we end up here:
                lyxerr << "LyX: execvp failed: "
-                      << std::strerror(errno) << endl;
+                      << strerror(errno) << endl;
        } else if (cpid < 0) { // error
 #else
        pid_t cpid = spawnvp(P_SESSION|P_DEFAULT|P_MINIMIZE|P_BACKGROUND, syscmd, argv);
        if (cpid < 0) { // error
 #endif
                lyxerr << "LyX: Could not fork: "
-                      << std::strerror(errno) << endl;
+                      << strerror(errno) << endl;
        } else { // parent
                return cpid;
        }
@@ -205,8 +209,11 @@ int Systemcalls::startscript(Starttype how, string const & what,
        retval  = 0;
 
        if (how == SystemDontWait) {
-               (os::shell() == os::UNIX) ? command += " &"
-                                         : command = "start /min/n " + command;
+               if (os::shell() == os::UNIX) {
+                       command += " &";
+               } else {
+                       command = "start /min/n " + command;
+               }
        }
 
         return startscript();