Merge branch 'master' into windows

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

diff --git a/libs/pbd/base_ui.cc b/libs/pbd/base_ui.cc
index 5725d691829d4874e68be9bcfe404c3b40debb91..3a4257ebdd9a9ecaf9bfc1109277543588e73427 100644 (file)
--- a/libs/pbd/base_ui.cc
+++ b/libs/pbd/base_ui.cc
@@ -19,7 +19,11 @@
 
 #include <cstring>
 #include <stdint.h>
+#ifdef COMPILER_MSVC
+#include <io.h>      // Microsoft's nearest equivalent to <unistd.h>
+#else
 #include <unistd.h>
+#endif
 #include <fcntl.h>
 #include <cerrno>
 #include <cstring>
@@ -47,13 +51,13 @@ BaseUI::BaseUI (const string& str)
        : m_context(MainContext::get_default())
        , run_loop_thread (0)
        , _name (str)
-#ifndef WIN32
+#ifndef PLATFORM_WINDOWS
        , request_channel (true)
 #endif
 {
        base_ui_instance = this;
 
-#ifndef WIN32
+#ifndef PLATFORM_WINDOWS
        request_channel.ios()->connect (sigc::mem_fun (*this, &BaseUI::request_handler));
 #endif
 
@@ -120,7 +124,7 @@ BaseUI::quit ()
        }
 }
 
-#ifdef WIN32
+#ifdef PLATFORM_WINDOWS
 gboolean
 BaseUI::_request_handler (gpointer data)
 {
@@ -168,7 +172,7 @@ void
 BaseUI::signal_new_request ()
 {
        DEBUG_TRACE (DEBUG::EventLoop, "BaseUI::signal_new_request\n");
-#ifdef WIN32
+#ifdef PLATFORM_WINDOWS
        // handled in timeout, how to signal...?
 #else
        request_channel.wakeup ();
@@ -182,7 +186,7 @@ void
 BaseUI::attach_request_source ()
 {
        DEBUG_TRACE (DEBUG::EventLoop, "BaseUI::attach_request_source\n");
-#ifdef WIN32
+#ifdef PLATFORM_WINDOWS
        GSource* request_source = g_timeout_source_new(200);
        g_source_set_callback (request_source, &BaseUI::_request_handler, this, NULL);
        g_source_attach (request_source, m_context->gobj());