diff options
| author | Goran Mekić <meka@tilda.center> | 2020-11-27 13:30:46 +0100 |
|---|---|---|
| committer | 0EVSG <dev@submerge.ch> | 2021-12-27 20:45:57 +0100 |
| commit | e8fa9bda0f76b1c8f02792c0e277e285642e78aa (patch) | |
| tree | 2e6cb05e85ca79f0593ac478db0988f214d3e202 | |
| parent | 518af9c2ac896f6a3121ceb4805e8f01089be2c4 (diff) | |
| download | jack2-e8fa9bda0f76b1c8f02792c0e277e285642e78aa.tar.gz | |
It compiles
| -rw-r--r-- | common/wscript | 3 | ||||
| -rw-r--r-- | freebsd/JackAtomic_os.h (renamed from freebsd/jackAtomic_os.h) | 0 | ||||
| l---------[-rw-r--r--] | freebsd/driver.h | 0 | ||||
| -rw-r--r-- | posix/JackPosixSemaphore.cpp | 7 |
4 files changed, 5 insertions, 5 deletions
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 index ca731f25..ca731f25 100644 --- a/freebsd/jackAtomic_os.h +++ b/freebsd/JackAtomic_os.h diff --git a/freebsd/driver.h b/freebsd/driver.h index eb240b9c..eb240b9c 100644..120000 --- a/freebsd/driver.h +++ b/freebsd/driver.h 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 <fcntl.h> #include <stdio.h> +#include <ctype.h> #include <sys/time.h> #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); |