diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-16 22:06:56 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-16 22:06:56 -0400 |
commit | e5888d398350b26ba2cdc634cc9791e90b4fc6b6 (patch) | |
tree | 54f485ea56d034ecba01938fbc680b12884fc136 /gtk2_ardour/sfdb_ui.cc | |
parent | 18850253e9f0034fad132e0da07a2651ce041450 (diff) | |
parent | da5a49067839ec32a016bf1b66c3808ad7cbf699 (diff) |
merge with master and fix 2 conflicts
Diffstat (limited to 'gtk2_ardour/sfdb_ui.cc')
-rw-r--r-- | gtk2_ardour/sfdb_ui.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index 5f8564374e..4944ef41a0 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -26,8 +26,8 @@ #include <sstream> #include <unistd.h> +#include <limits.h> #include <sys/stat.h> -#include <sys/param.h> #include <gtkmm/box.h> #include <gtkmm/stock.h> @@ -1468,7 +1468,7 @@ SoundFileOmega::check_link_status (const Session* s, const vector<string>& paths for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) { - char tmpc[MAXPATHLEN+1]; + char tmpc[PATH_MAX+1]; snprintf (tmpc, sizeof(tmpc), "%s/%s", tmpdir.c_str(), Glib::path_get_basename (*i).c_str()); |