From: Mike Brady Date: Wed, 12 Dec 2018 22:07:55 +0000 (+0000) Subject: Remove connection with common.h -- works properly. X-Git-Tag: 3.3RC0~93 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8fe3bd13b13d6da771916342d62fc0c4f24b8b6;p=thirdparty%2Fshairport-sync.git Remove connection with common.h -- works properly. --- diff --git a/FFTConvolver/convolver.cpp b/FFTConvolver/convolver.cpp index 55ad42f4..f115cf85 100644 --- a/FFTConvolver/convolver.cpp +++ b/FFTConvolver/convolver.cpp @@ -4,10 +4,9 @@ #include #include "FFTConvolver.h" #include "Utilities.h" -extern "C" { -#include "../common.h" -} +extern "C" void die(const char *format, ...); +extern "C" void debug(int level, const char *format, ...); static fftconvolver::FFTConvolver convolver_l; static fftconvolver::FFTConvolver convolver_r; diff --git a/common.c b/common.c index 46654290..053abbe3 100644 --- a/common.c +++ b/common.c @@ -90,7 +90,7 @@ static volatile int requested_connection_state_to_output = 1; shairport_cfg config; -static volatile int debuglev = 0; +volatile int debuglev = 0; sigset_t pselect_sigset; diff --git a/common.h b/common.h index 0d031d8b..243052b6 100644 --- a/common.h +++ b/common.h @@ -259,7 +259,8 @@ int64_t ranarray64i(); void resetFreeUDPPort(); uint16_t nextFreeUDPPort(); -static volatile int debuglev; +volatile int debuglev; + void die(const char *format, ...); void warn(const char *format, ...); void inform(const char *format, ...);