diff --git a/common/wscript b/common/wscript index e22f12f4..bc23ced1 100644 --- a/common/wscript +++ b/common/wscript @@ -22,7 +22,6 @@ def create_jack_process_obj(bld, target, sources, uselib = None, framework = Non if not bld.env['IS_WINDOWS']: process.env['cxxshlib_PATTERN'] = '%s.so' process.defines = ['HAVE_CONFIG_H','SERVER_SIDE'] - print(bld.env) if bld.env['IS_MACOSX']: if framework: process.framework = framework @@ -77,7 +76,7 @@ def build(bld): includes.append('..') else: includes.append('../..') - uselib = ['CELT', 'OPUS', 'DB', 'PTHREAD'] + uselib = ['CELT', 'OPUS', 'DB', 'PTHREAD', 'SAMPLERATE'] if bld.env['IS_LINUX']: common_libsources += [ diff --git a/freebsd/jackAtomic_os.h b/freebsd/JackAtomic_os.h similarity index 100% rename from freebsd/jackAtomic_os.h rename to freebsd/JackAtomic_os.h diff --git a/freebsd/driver.h b/freebsd/driver.h deleted file mode 100644 index eb240b9c..00000000 --- a/freebsd/driver.h +++ /dev/null @@ -1 +0,0 @@ -../linux/driver.h \ No newline at end of file diff --git a/freebsd/driver.h b/freebsd/driver.h new file mode 120000 index 00000000..eb240b9c --- /dev/null +++ b/freebsd/driver.h @@ -0,0 +1 @@ +../linux/driver.h \ No newline at end of file diff --git a/posix/JackPosixSemaphore.cpp b/posix/JackPosixSemaphore.cpp index a18b6b70..5103f1cf 100644 --- a/posix/JackPosixSemaphore.cpp +++ b/posix/JackPosixSemaphore.cpp @@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define _POSIX_C_SOURCE 200112L +// #define _POSIX_C_SOURCE 200112L #include "JackPosixSemaphore.h" #include "JackTools.h" @@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "JackError.h" #include #include +#include #include #ifdef __linux__ #include "promiscuous.h" @@ -54,8 +55,8 @@ void JackPosixSemaphore::BuildName(const char* client_name, const char* server_n { char ext_client_name[SYNC_MAX_NAME_SIZE + 1]; JackTools::RewriteName(client_name, ext_client_name); -#if __APPLE__ // POSIX semaphore names are limited to 32 characters... - snprintf(res, 32, "js_%s", ext_client_name); +#if __APPLE__ // POSIX semaphore names are limited to 32 characters... + snprintf(res, 32, "js_%s", ext_client_name); #else if (fPromiscuous) { snprintf(res, size, JACK_SEM_PREFIX ".%s_%s", server_name, ext_client_name);