Merge pull request #2362 from petterreinholdtsen/debian-gcc-5

Fix build problems with gcc 5.2 in Debian.
This commit is contained in:
Colin Wallace
2015-09-20 08:28:24 +00:00
4 changed files with 6 additions and 6 deletions

View File

@@ -117,7 +117,7 @@ inline void setup_f_svf(sv_filter *sv, const float fs, const float fc) {
/* Run one sample through the SV filter. Filter is by andy@vellocet */
inline float run_svf(sv_filter *sv, float in) {
static inline float run_svf(sv_filter *sv, float in) {
float out;
int i;
@@ -144,7 +144,7 @@ inline float run_svf(sv_filter *sv, float in) {
return out;
}
inline int wave_tbl(const float wave) {
static inline int wave_tbl(const float wave) {
switch (f_round(wave)) {
case 0:
return BLO_SINE;

View File

@@ -63,7 +63,7 @@ typedef rfftw_plan fft_plan;
#define MK_IMP(i) impulse2freq(c, i, IMP_LENGTH(i), impulse_freq[c]); c++
inline void impulse2freq(int id, float *imp, unsigned int length, fftw_real *out);
static inline void impulse2freq(int id, float *imp, unsigned int length, fftw_real *out);
#include "impulses/all.h"
@@ -77,7 +77,7 @@ unsigned int fft_length[IMPULSES];
#ifdef __clang__
void impulse2freq(int id, float *imp, unsigned int length, fftw_real *out)
#else
inline void impulse2freq(int id, float *imp, unsigned int length, fftw_real *out)
static inline void impulse2freq(int id, float *imp, unsigned int length, fftw_real *out)
#endif
{
fftw_real impulse_time[MAX_FFT_LENGTH];

View File

@@ -27,7 +27,7 @@
#ifdef __clang__
void mk_imps(fftw_real **impulse_freq)
#else
inline void mk_imps(fftw_real **impulse_freq)
static inline void mk_imps(fftw_real **impulse_freq)
#endif
{
int c = 0;

View File

@@ -31,7 +31,7 @@ void __attribute__((constructor)) swh_init(); // forward declaration
#define BASE_BUFFER 0.001 // Base buffer length (s)
inline LADSPA_Data sat(LADSPA_Data x, float q, float dist) {
static inline LADSPA_Data sat(LADSPA_Data x, float q, float dist) {
if (x == q) {
return 1.0f / dist + q / (1.0f - f_exp(dist * q));
}