diff options
| author | Sakari Bergen <sakari.bergen@beatwaves.net> | 2008-12-30 17:51:21 +0000 |
|---|---|---|
| committer | Sakari Bergen <sakari.bergen@beatwaves.net> | 2008-12-30 17:51:21 +0000 |
| commit | c5f9501e501f7444060d1b4a4fb368336ff697be (patch) | |
| tree | ab689ddf0c3ed77958630947d639de7f4df8d211 /gtk2_ardour | |
| parent | 8b5acdf4141c99dd66cfcc32e5f63b11b9cbfb62 (diff) | |
Fix more compiling/linking errors on OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@4360 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/nag.cc | 8 | ||||
| -rw-r--r-- | gtk2_ardour/tempo_lines.h | 2 |
2 files changed, 5 insertions, 5 deletions
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> |