merge from 2.0-ongoing @ 3581

[ardour.git] / libs / pbd / base_ui.cc

diff --git a/libs/pbd/base_ui.cc b/libs/pbd/base_ui.cc
index 94d039ba8633aef20c4d9f462527831a7e996de6..0dbe6baf5227a5d18305a4c322330b6e1e8ab971 100644 (file)
--- a/libs/pbd/base_ui.cc
+++ b/libs/pbd/base_ui.cc
@@ -21,7 +21,8 @@
 #include <stdint.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <errno.h>
+#include <cerrno>
+#include <cstring>
 
 #include <pbd/base_ui.h>
 #include <pbd/error.h>
@@ -85,20 +86,20 @@ BaseUI::setup_signal_pipe ()
        */
 
        if (pipe (signal_pipe)) {
-               error << string_compose (_("%1-UI: cannot create error signal pipe (%2)"), _name, std::strerror (errno))
+               error << string_compose (_("%1-UI: cannot create error signal pipe (%2)"), _name, ::strerror (errno))
                      << endmsg;
 
                return -1;
        }
 
        if (fcntl (signal_pipe[0], F_SETFL, O_NONBLOCK)) {
-               error << string_compose (_("%1-UI: cannot set O_NONBLOCK on signal read pipe (%2)"), _name, std::strerror (errno))
+               error << string_compose (_("%1-UI: cannot set O_NONBLOCK on signal read pipe (%2)"), _name, ::strerror (errno))
                      << endmsg;
                return -1;
        }
 
        if (fcntl (signal_pipe[1], F_SETFL, O_NONBLOCK)) {
-               error << string_compose (_("%1-UI: cannot set O_NONBLOCK on signal write pipe (%2)"), _name, std::strerror (errno))
+               error << string_compose (_("%1-UI: cannot set O_NONBLOCK on signal write pipe (%2)"), _name, ::strerror (errno))
                      << endmsg;
                return -1;
        }