diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc index 4600f984dc..514396a7ab 100644 --- a/libs/ardour/plugin_manager.cc +++ b/libs/ardour/plugin_manager.cc @@ -118,8 +118,9 @@ #include #endif -#ifdef VST3_SUPPORT #include "ardour/system_exec.h" + +#ifdef VST3_SUPPORT #include "ardour/vst3_module.h" #include "ardour/vst3_plugin.h" #include "ardour/vst3_scan.h" diff --git a/libs/backends/jack/jack_utils.cc b/libs/backends/jack/jack_utils.cc index 7ef20913c6..414a6969ef 100644 --- a/libs/backends/jack/jack_utils.cc +++ b/libs/backends/jack/jack_utils.cc @@ -119,9 +119,10 @@ ARDOUR::get_jack_audio_driver_names (vector& audio_driver_names) #ifdef HAVE_ALSA audio_driver_names.push_back (alsa_driver_name); #endif - audio_driver_names.push_back (oss_driver_name); -#if defined(__NetBSD__) || defined(__sun) +#if defined(__NetBSD__) audio_driver_names.push_back (sun_driver_name); +#else + audio_driver_names.push_back (oss_driver_name); #endif audio_driver_names.push_back (freebob_driver_name); audio_driver_names.push_back (ffado_driver_name); @@ -506,7 +507,7 @@ bool ARDOUR::get_jack_audio_driver_supports_setting_period_count (const string& driver) { return !(driver == dummy_driver_name || driver == coreaudio_driver_name || - driver == portaudio_driver_name); + driver == portaudio_driver_name || driver == sun_driver_name); } bool @@ -687,7 +688,7 @@ ARDOUR::get_jack_command_line_string (JackCommandLineOptions& options, string& c args.push_back (options.server_path); -#ifdef PLATFORM_WINDOWS +#if defined(PLATFORM_WINDOWS) || defined(__NetBSD__) || defined(__sun) // must use sync mode on windows args.push_back ("-S"); #endif @@ -717,6 +718,7 @@ ARDOUR::get_jack_command_line_string (JackCommandLineOptions& options, string& c args.push_back ("-p"); args.push_back (to_string(options.ports_max)); +#ifndef __NetBSD__ if (options.realtime) { args.push_back ("-R"); if (options.priority != 0) { @@ -726,6 +728,9 @@ ARDOUR::get_jack_command_line_string (JackCommandLineOptions& options, string& c } else { args.push_back ("-r"); } +#else + args.push_back ("-r"); +#endif if (options.unlock_gui_libs) { args.push_back ("-u"); diff --git a/libs/pbd/cpus.cc b/libs/pbd/cpus.cc index faf768d4af..d538697425 100644 --- a/libs/pbd/cpus.cc +++ b/libs/pbd/cpus.cc @@ -25,7 +25,7 @@ #ifdef __linux__ #include -#elif defined(__APPLE__) || defined(__FreeBSD__) +#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) #include #include #include diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h index 229b61be71..ba4b54730d 100644 --- a/libs/tk/ydk/config.h +++ b/libs/tk/ydk/config.h @@ -27,7 +27,7 @@ #define HAVE_GETRESUID 1 #endif -#ifndef __APPLE__ +#if !defined(__APPLE__) && !defined(__NetBSD__) /* Have GNU ftw */ #define HAVE_GNU_FTW 1 #endif diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h index 5a04482361..d913bc1ee3 100644 --- a/libs/tk/ytk/config.h +++ b/libs/tk/ytk/config.h @@ -24,11 +24,11 @@ #endif /* Define to 1 if you have the `getresuid' function. */ -#if !(defined PLATFORM_WINDOWS || defined __APPLE__) +#if !(defined PLATFORM_WINDOWS || defined __APPLE__ || defined(__NetBSD__)) #define HAVE_GETRESUID 1 #endif -#ifndef __APPLE__ +#if !defined(__APPLE__) && !defined(__NetBSD__) /* Have GNU ftw */ #define HAVE_GNU_FTW 1 #endif