Fix more compiling/linking errors on OS X

git-svn-id: svn://localhost/ardour2/branches/3.0@4360 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/nag.cc b/gtk2_ardour/nag.cc
index ece3ac3e2a6c1990f9f8e860180b2119683326f5..d239d850c73164d44a9ca88f95b6eec759e02a7f 100644 (file)
--- a/gtk2_ardour/nag.cc
+++ b/gtk2_ardour/nag.cc
@@ -192,15 +192,15 @@ NagScreen::open_uri (const char* uri)
        GError* err;
        return gtk_open_uri (0, uri, GDK_CURRENT_TIME, &err);
 #else
-#ifndef __APPLE__
+#ifdef GTKOSX
+       extern bool cocoa_open_url (const char*);
+       return cocoa_open_url (uri);
+#else
        std::string command = "xdg-open ";
        command += uri;
        spawn_command_line_async (command);
 
        return true;
-#else
-       extern bool cocoa_open_url (const char*);
-       return cocoa_open_url (uri);
 #endif
 #endif
 }

diff --git a/gtk2_ardour/tempo_lines.h b/gtk2_ardour/tempo_lines.h
index 83c71849c2e5de957663319d5ffefd86a1e3930f..d5040bd90fb4004e04f5c76aba3e03713e9fc923 100644 (file)
--- a/gtk2_ardour/tempo_lines.h
+++ b/gtk2_ardour/tempo_lines.h
@@ -27,7 +27,7 @@
 #include "simpleline.h"
 
 typedef boost::fast_pool_allocator<
-               std::pair<double, ArdourCanvas::SimpleLine>,
+               std::pair<const double, ArdourCanvas::SimpleLine*>,
                boost::default_user_allocator_new_delete,
                boost::details::pool::null_mutex,
                8192>