lyxserver cleanup patch + andre's small patches

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

diff --git a/src/support/syscontr.C b/src/support/syscontr.C
index 56d46b810e08a21a5bd56733bb3cc11a8bf21a76..e15294fcdc5625997f0c84af4de60a7d7418eb92 100644 (file)
--- a/src/support/syscontr.C
+++ b/src/support/syscontr.C
@@ -15,6 +15,10 @@
 
 using std::endl;
 
+#ifndef CXX_GLOBAL_CSTD
+using std::strerror;
+#endif
+
 //
 // Default constructor
 //
@@ -76,7 +80,7 @@ SystemcallsSingletoncontroller::timer() {
                int waitrpid = waitpid(pid, &stat_loc, WNOHANG);
                if (waitrpid == -1) {
                        lyxerr << "LyX: Error waiting for child:" 
-                              << std::strerror(errno) << endl;
+                              << strerror(errno) << endl;
                } else if (WIFEXITED(stat_loc) || WIFSIGNALED(stat_loc)) {
                        if (WIFEXITED(stat_loc)) {
                                // Ok, the return value goes into retval.