From 7c8fa72c60434675db270c7ae05fd7abf2346cbb Mon Sep 17 00:00:00 2001 From: Chris Cannam Date: Wed, 10 Feb 2021 11:07:33 +0000 Subject: [PATCH] Avoid reserved preprocessor symbols --- ladspa/RubberBandPitchShifter.h | 4 ++-- rubberband/RubberBandStretcher.h | 4 ++-- rubberband/rubberband-c.h | 4 ++-- src/StretchCalculator.h | 4 ++-- src/StretcherChannelData.h | 4 ++-- src/StretcherImpl.h | 4 ++-- src/audiocurves/CompoundAudioCurve.h | 4 ++-- src/audiocurves/ConstantAudioCurve.h | 4 ++-- src/audiocurves/HighFrequencyAudioCurve.h | 4 ++-- src/audiocurves/PercussiveAudioCurve.h | 4 ++-- src/audiocurves/SilentAudioCurve.h | 4 ++-- src/audiocurves/SpectralDifferenceAudioCurve.h | 4 ++-- src/base/Profiler.h | 4 ++-- src/base/RingBuffer.h | 6 +++--- src/base/Scavenger.h | 4 ++-- src/dsp/AudioCurveCalculator.h | 4 ++-- src/dsp/FFT.h | 4 ++-- src/dsp/MovingMedian.h | 4 ++-- src/dsp/SampleFilter.h | 4 ++-- src/dsp/SincWindow.h | 4 ++-- src/dsp/Window.h | 4 ++-- src/pommier/sse_mathfun.h | 4 ++-- src/system/Thread.h | 4 ++-- src/system/VectorOps.h | 4 ++-- src/system/VectorOpsComplex.h | 4 ++-- src/system/sysutils.h | 4 ++-- vamp/RubberBandVampPlugin.h | 4 ++-- 27 files changed, 55 insertions(+), 55 deletions(-) diff --git a/ladspa/RubberBandPitchShifter.h b/ladspa/RubberBandPitchShifter.h index 15a1cf4..7f56e11 100644 --- a/ladspa/RubberBandPitchShifter.h +++ b/ladspa/RubberBandPitchShifter.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _RUBBERBAND_PITCH_SHIFTER_H_ -#define _RUBBERBAND_PITCH_SHIFTER_H_ +#ifndef RUBBERBAND_PITCH_SHIFTER_H +#define RUBBERBAND_PITCH_SHIFTER_H #include diff --git a/rubberband/RubberBandStretcher.h b/rubberband/RubberBandStretcher.h index ad16ca3..ebcf1fa 100644 --- a/rubberband/RubberBandStretcher.h +++ b/rubberband/RubberBandStretcher.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _RUBBERBANDSTRETCHER_H_ -#define _RUBBERBANDSTRETCHER_H_ +#ifndef RUBBERBAND_STRETCHER_H +#define RUBBERBAND_STRETCHER_H #define RUBBERBAND_VERSION "1.9.0" #define RUBBERBAND_API_MAJOR_VERSION 2 diff --git a/rubberband/rubberband-c.h b/rubberband/rubberband-c.h index 41bcfac..5727aa1 100644 --- a/rubberband/rubberband-c.h +++ b/rubberband/rubberband-c.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _RUBBERBAND_C_API_H_ -#define _RUBBERBAND_C_API_H_ +#ifndef RUBBERBAND_C_API_H +#define RUBBERBAND_C_API_H #ifdef __cplusplus extern "C" { diff --git a/src/StretchCalculator.h b/src/StretchCalculator.h index 4f4b2c0..fc3822d 100644 --- a/src/StretchCalculator.h +++ b/src/StretchCalculator.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _RUBBERBAND_STRETCH_CALCULATOR_H_ -#define _RUBBERBAND_STRETCH_CALCULATOR_H_ +#ifndef RUBBERBAND_STRETCH_CALCULATOR_H +#define RUBBERBAND_STRETCH_CALCULATOR_H #include diff --git a/src/StretcherChannelData.h b/src/StretcherChannelData.h index 9b519eb..2147571 100644 --- a/src/StretcherChannelData.h +++ b/src/StretcherChannelData.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _RUBBERBAND_STRETCHERCHANNELDATA_H_ -#define _RUBBERBAND_STRETCHERCHANNELDATA_H_ +#ifndef RUBBERBAND_STRETCHERCHANNELDATA_H +#define RUBBERBAND_STRETCHERCHANNELDATA_H #include "StretcherImpl.h" diff --git a/src/StretcherImpl.h b/src/StretcherImpl.h index 213882f..1f15bd2 100644 --- a/src/StretcherImpl.h +++ b/src/StretcherImpl.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _RUBBERBAND_STRETCHERIMPL_H_ -#define _RUBBERBAND_STRETCHERIMPL_H_ +#ifndef RUBBERBAND_STRETCHERIMPL_H +#define RUBBERBAND_STRETCHERIMPL_H #include "rubberband/RubberBandStretcher.h" diff --git a/src/audiocurves/CompoundAudioCurve.h b/src/audiocurves/CompoundAudioCurve.h index 2cadc4d..123f8a6 100644 --- a/src/audiocurves/CompoundAudioCurve.h +++ b/src/audiocurves/CompoundAudioCurve.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _COMPOUND_AUDIO_CURVE_H_ -#define _COMPOUND_AUDIO_CURVE_H_ +#ifndef RUBBERBAND_COMPOUND_AUDIO_CURVE_H +#define RUBBERBAND_COMPOUND_AUDIO_CURVE_H #include "dsp/AudioCurveCalculator.h" #include "PercussiveAudioCurve.h" diff --git a/src/audiocurves/ConstantAudioCurve.h b/src/audiocurves/ConstantAudioCurve.h index acdc907..a97ac4e 100644 --- a/src/audiocurves/ConstantAudioCurve.h +++ b/src/audiocurves/ConstantAudioCurve.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _CONSTANT_AUDIO_CURVE_H_ -#define _CONSTANT_AUDIO_CURVE_H_ +#ifndef RUBBERBAND_CONSTANT_AUDIO_CURVE_H +#define RUBBERBAND_CONSTANT_AUDIO_CURVE_H #include "dsp/AudioCurveCalculator.h" diff --git a/src/audiocurves/HighFrequencyAudioCurve.h b/src/audiocurves/HighFrequencyAudioCurve.h index eec68f8..34db579 100644 --- a/src/audiocurves/HighFrequencyAudioCurve.h +++ b/src/audiocurves/HighFrequencyAudioCurve.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _HIGHFREQUENCY_AUDIO_CURVE_H_ -#define _HIGHFREQUENCY_AUDIO_CURVE_H_ +#ifndef RUBBERBAND_HIGHFREQUENCY_AUDIO_CURVE_H +#define RUBBERBAND_HIGHFREQUENCY_AUDIO_CURVE_H #include "dsp/AudioCurveCalculator.h" diff --git a/src/audiocurves/PercussiveAudioCurve.h b/src/audiocurves/PercussiveAudioCurve.h index 8c5dde4..645d1dd 100644 --- a/src/audiocurves/PercussiveAudioCurve.h +++ b/src/audiocurves/PercussiveAudioCurve.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _PERCUSSIVE_AUDIO_CURVE_H_ -#define _PERCUSSIVE_AUDIO_CURVE_H_ +#ifndef RUBBERBAND_PERCUSSIVE_AUDIO_CURVE_H +#define RUBBERBAND_PERCUSSIVE_AUDIO_CURVE_H #include "dsp/AudioCurveCalculator.h" diff --git a/src/audiocurves/SilentAudioCurve.h b/src/audiocurves/SilentAudioCurve.h index c6a9f1b..36b7984 100644 --- a/src/audiocurves/SilentAudioCurve.h +++ b/src/audiocurves/SilentAudioCurve.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _SILENT_AUDIO_CURVE_H_ -#define _SILENT_AUDIO_CURVE_H_ +#ifndef RUBBERBAND_SILENT_AUDIO_CURVE_H +#define RUBBERBAND_SILENT_AUDIO_CURVE_H #include "dsp/AudioCurveCalculator.h" diff --git a/src/audiocurves/SpectralDifferenceAudioCurve.h b/src/audiocurves/SpectralDifferenceAudioCurve.h index 9001a05..66b6133 100644 --- a/src/audiocurves/SpectralDifferenceAudioCurve.h +++ b/src/audiocurves/SpectralDifferenceAudioCurve.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _SPECTRALDIFFERENCE_AUDIO_CURVE_H_ -#define _SPECTRALDIFFERENCE_AUDIO_CURVE_H_ +#ifndef RUBBERBAND_SPECTRALDIFFERENCE_AUDIO_CURVE_H +#define RUBBERBAND_SPECTRALDIFFERENCE_AUDIO_CURVE_H #include "dsp/AudioCurveCalculator.h" #include "dsp/Window.h" diff --git a/src/base/Profiler.h b/src/base/Profiler.h index 3a01b0e..bc39107 100644 --- a/src/base/Profiler.h +++ b/src/base/Profiler.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _PROFILER_H_ -#define _PROFILER_H_ +#ifndef RUBBERBAND_PROFILER_H +#define RUBBERBAND_PROFILER_H //#define NO_TIMING 1 //#define WANT_TIMING 1 diff --git a/src/base/RingBuffer.h b/src/base/RingBuffer.h index 7ad0cdb..3586b91 100644 --- a/src/base/RingBuffer.h +++ b/src/base/RingBuffer.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _RUBBERBAND_RINGBUFFER_H_ -#define _RUBBERBAND_RINGBUFFER_H_ +#ifndef RUBBERBAND_RINGBUFFER_H +#define RUBBERBAND_RINGBUFFER_H #include @@ -524,4 +524,4 @@ RingBuffer::zero(int n) } -#endif // _RINGBUFFER_H_ +#endif // _RINGBUFFER_H diff --git a/src/base/Scavenger.h b/src/base/Scavenger.h index e93ee07..e5b9b24 100644 --- a/src/base/Scavenger.h +++ b/src/base/Scavenger.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _RUBBERBAND_SCAVENGER_H_ -#define _RUBBERBAND_SCAVENGER_H_ +#ifndef RUBBERBAND_SCAVENGER_H +#define RUBBERBAND_SCAVENGER_H #include #include diff --git a/src/dsp/AudioCurveCalculator.h b/src/dsp/AudioCurveCalculator.h index ad5abbd..0b47cd0 100644 --- a/src/dsp/AudioCurveCalculator.h +++ b/src/dsp/AudioCurveCalculator.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _AUDIO_CURVE_CALCULATOR_H_ -#define _AUDIO_CURVE_CALCULATOR_H_ +#ifndef RUBBERBAND_AUDIO_CURVE_CALCULATOR_H +#define RUBBERBAND_AUDIO_CURVE_CALCULATOR_H #include diff --git a/src/dsp/FFT.h b/src/dsp/FFT.h index b3328e0..55c763b 100644 --- a/src/dsp/FFT.h +++ b/src/dsp/FFT.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _RUBBERBAND_FFT_H_ -#define _RUBBERBAND_FFT_H_ +#ifndef RUBBERBAND_FFT_H +#define RUBBERBAND_FFT_H #include "system/sysutils.h" diff --git a/src/dsp/MovingMedian.h b/src/dsp/MovingMedian.h index 7eabef1..50b7eca 100644 --- a/src/dsp/MovingMedian.h +++ b/src/dsp/MovingMedian.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _MOVING_MEDIAN_H_ -#define _MOVING_MEDIAN_H_ +#ifndef RUBBERBAND_MOVING_MEDIAN_H +#define RUBBERBAND_MOVING_MEDIAN_H #include "SampleFilter.h" diff --git a/src/dsp/SampleFilter.h b/src/dsp/SampleFilter.h index 2ce5583..9616e20 100644 --- a/src/dsp/SampleFilter.h +++ b/src/dsp/SampleFilter.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _SAMPLE_FILTER_H_ -#define _SAMPLE_FILTER_H_ +#ifndef RUBBERBAND_SAMPLE_FILTER_H +#define RUBBERBAND_SAMPLE_FILTER_H #include diff --git a/src/dsp/SincWindow.h b/src/dsp/SincWindow.h index 8b5d248..43670ad 100644 --- a/src/dsp/SincWindow.h +++ b/src/dsp/SincWindow.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _RUBBERBAND_SINC_WINDOW_H_ -#define _RUBBERBAND_SINC_WINDOW_H_ +#ifndef RUBBERBAND_SINC_WINDOW_H +#define RUBBERBAND_SINC_WINDOW_H #include #include diff --git a/src/dsp/Window.h b/src/dsp/Window.h index 1175fbd..52893a9 100644 --- a/src/dsp/Window.h +++ b/src/dsp/Window.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _RUBBERBAND_WINDOW_H_ -#define _RUBBERBAND_WINDOW_H_ +#ifndef RUBBERBAND_WINDOW_H +#define RUBBERBAND_WINDOW_H #include #include diff --git a/src/pommier/sse_mathfun.h b/src/pommier/sse_mathfun.h index 6d3d5f3..d456ed6 100644 --- a/src/pommier/sse_mathfun.h +++ b/src/pommier/sse_mathfun.h @@ -1,6 +1,6 @@ -#ifndef _POMMIER_SSE_MATHFUN_H_ -#define _POMMIER_SSE_MATHFUN_H_ +#ifndef POMMIER_SSE_MATHFUN_H +#define POMMIER_SSE_MATHFUN_H /* SIMD (SSE1+MMX or SSE2) implementation of sin, cos, exp and log diff --git a/src/system/Thread.h b/src/system/Thread.h index 0e342f9..3a41980 100644 --- a/src/system/Thread.h +++ b/src/system/Thread.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _RUBBERBAND_THREAD_H_ -#define _RUBBERBAND_THREAD_H_ +#ifndef RUBBERBAND_THREAD_H +#define RUBBERBAND_THREAD_H #include diff --git a/src/system/VectorOps.h b/src/system/VectorOps.h index a293fac..cb58498 100644 --- a/src/system/VectorOps.h +++ b/src/system/VectorOps.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _RUBBERBAND_VECTOR_OPS_H_ -#define _RUBBERBAND_VECTOR_OPS_H_ +#ifndef RUBBERBAND_VECTOR_OPS_H +#define RUBBERBAND_VECTOR_OPS_H #ifdef HAVE_IPP #ifndef _MSC_VER diff --git a/src/system/VectorOpsComplex.h b/src/system/VectorOpsComplex.h index 0a78639..8d4161b 100644 --- a/src/system/VectorOpsComplex.h +++ b/src/system/VectorOpsComplex.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _RUBBERBAND_VECTOR_OPS_COMPLEX_H_ -#define _RUBBERBAND_VECTOR_OPS_COMPLEX_H_ +#ifndef RUBBERBAND_VECTOR_OPS_COMPLEX_H +#define RUBBERBAND_VECTOR_OPS_COMPLEX_H #include "VectorOps.h" diff --git a/src/system/sysutils.h b/src/system/sysutils.h index e05c3a5..9a0f53a 100644 --- a/src/system/sysutils.h +++ b/src/system/sysutils.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _RUBBERBAND_SYSUTILS_H_ -#define _RUBBERBAND_SYSUTILS_H_ +#ifndef RUBBERBAND_SYSUTILS_H +#define RUBBERBAND_SYSUTILS_H #ifdef _MSC_VER # if _MSC_VER < 1800 diff --git a/vamp/RubberBandVampPlugin.h b/vamp/RubberBandVampPlugin.h index 10b5b74..5469b5f 100644 --- a/vamp/RubberBandVampPlugin.h +++ b/vamp/RubberBandVampPlugin.h @@ -21,8 +21,8 @@ you must obtain a valid commercial licence before doing so. */ -#ifndef _RUBBERBAND_VAMP_PLUGIN_H_ -#define _RUBBERBAND_VAMP_PLUGIN_H_ +#ifndef RUBBERBAND_VAMP_PLUGIN_H +#define RUBBERBAND_VAMP_PLUGIN_H #include