Browse Source

It compiles

tags/v1.9.20
Goran Mekić falkTX <falktx@falktx.com> 4 years ago
parent
commit
25e09df3a6
5 changed files with 6 additions and 6 deletions
  1. +1
    -2
      common/wscript
  2. +0
    -0
      freebsd/JackAtomic_os.h
  3. +0
    -1
      freebsd/driver.h
  4. +1
    -0
      freebsd/driver.h
  5. +4
    -3
      posix/JackPosixSemaphore.cpp

+ 1
- 2
common/wscript View File

@@ -22,7 +22,6 @@ def create_jack_process_obj(bld, target, sources, uselib = None, framework = Non
if not bld.env['IS_WINDOWS']: if not bld.env['IS_WINDOWS']:
process.env['cxxshlib_PATTERN'] = '%s.so' process.env['cxxshlib_PATTERN'] = '%s.so'
process.defines = ['HAVE_CONFIG_H','SERVER_SIDE'] process.defines = ['HAVE_CONFIG_H','SERVER_SIDE']
print(bld.env)
if bld.env['IS_MACOSX']: if bld.env['IS_MACOSX']:
if framework: if framework:
process.framework = framework process.framework = framework
@@ -77,7 +76,7 @@ def build(bld):
includes.append('..') includes.append('..')
else: else:
includes.append('../..') includes.append('../..')
uselib = ['CELT', 'OPUS', 'DB', 'PTHREAD']
uselib = ['CELT', 'OPUS', 'DB', 'PTHREAD', 'SAMPLERATE']


if bld.env['IS_LINUX']: if bld.env['IS_LINUX']:
common_libsources += [ common_libsources += [


freebsd/jackAtomic_os.h → freebsd/JackAtomic_os.h View File


+ 0
- 1
freebsd/driver.h View File

@@ -1 +0,0 @@
../linux/driver.h

+ 1
- 0
freebsd/driver.h View File

@@ -0,0 +1 @@
../linux/driver.h

+ 4
- 3
posix/JackPosixSemaphore.cpp View File

@@ -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 "JackPosixSemaphore.h"
#include "JackTools.h" #include "JackTools.h"
@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "JackError.h" #include "JackError.h"
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <ctype.h>
#include <sys/time.h> #include <sys/time.h>
#ifdef __linux__ #ifdef __linux__
#include "promiscuous.h" #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]; char ext_client_name[SYNC_MAX_NAME_SIZE + 1];
JackTools::RewriteName(client_name, ext_client_name); 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 #else
if (fPromiscuous) { if (fPromiscuous) {
snprintf(res, size, JACK_SEM_PREFIX ".%s_%s", server_name, ext_client_name); snprintf(res, size, JACK_SEM_PREFIX ".%s_%s", server_name, ext_client_name);


Loading…
Cancel
Save