From: Sakari Bergen <sakari.bergen@beatwaves.net>
Date: Tue, 30 Dec 2008 17:51:21 +0000 (+0000)
Subject: Fix more compiling/linking errors on OS X
X-Git-Tag: 3.0-alpha5~3895
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=c5f9501e501f7444060d1b4a4fb368336ff697be;p=ardour.git

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 ece3ac3e2a..d239d850c7 100644
--- 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 83c71849c2..d5040bd90f 100644
--- 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>