diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-02 00:01:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-02 00:01:31 +0200 |
| commit | 53fbd93409adfde3671396b52291c02a1c281843 (patch) | |
| tree | 2e668e40c6ad51da360f5dfcbfd30279f5c84b9f /servers/audio/reverb_sw.cpp | |
| parent | fb5e732f78d388e9063f4563198ebd0518ae0878 (diff) | |
| parent | b2bba4be44dc34953402c5cde74c26b89ad84cbc (diff) | |
Merge pull request #22593 from akien-mga/fix-warnings
Fix various warnings raised by Clang 7
Diffstat (limited to 'servers/audio/reverb_sw.cpp')
| -rw-r--r-- | servers/audio/reverb_sw.cpp | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/servers/audio/reverb_sw.cpp b/servers/audio/reverb_sw.cpp index 13742d5db5..d078da38b4 100644 --- a/servers/audio/reverb_sw.cpp +++ b/servers/audio/reverb_sw.cpp @@ -29,33 +29,21 @@ /*************************************************************************/ #include "reverb_sw.h" + #include "core/print_string.h" -#include "stdlib.h" + +#include <stdlib.h> + #define SETMIN(x, y) (x) = MIN((x), (y)) + #define rangeloop(c, min, max) \ for ((c) = (min); (c) < (max); (c)++) #define ABSDIFF(x, y) \ (((x) < (y)) ? ((y) - (x)) : ((x) - (y))) -#ifdef bleh_MSC_VER - -#if _MSC_VER >= 1400 -_FORCE_INLINE_ int32_tMULSHIFT_S32( - int32_t Factor1, - int32_t Factor2, - uint8_t Bits) { - - return __ll_rshift( - __emul(Factor1, Factor2), - Bits); -} -#endif - -#else #define MULSHIFT_S32(Factor1, Factor2, Bits) \ ((int)(((int64_t)(Factor1) * (Factor2)) >> (Bits))) -#endif struct ReverbParamsSW { unsigned int BufferSize; // Required buffer size |