diff options
author | Gregory Maxwell <greg@xiph.org> | 2012-07-18 12:12:35 -0400 |
---|---|---|
committer | Gregory Maxwell <greg@xiph.org> | 2012-07-18 12:12:35 -0400 |
commit | de0b5324b687c9e9a33722d84151de08ee7f82a9 (patch) | |
tree | 4d80ef9939e11bf1796dc50949c9790cb77930c9 /celt/mdct.h | |
parent | 31e8a845923ace3cb818dd12839188cf3f29af80 (diff) | |
download | opus-de0b5324b687c9e9a33722d84151de08ee7f82a9.tar.gz |
Replace C99 restrict keyword with OPUS_RESTRICT.
We had previously advised people to -Drestrict on
non-C99 compilers, but this creates problems for
some of the MSVC headers. Instead this just
uses a macro and defines it sanely.
Diffstat (limited to 'celt/mdct.h')
-rw-r--r-- | celt/mdct.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/celt/mdct.h b/celt/mdct.h index 5ec26d0a..201f28b4 100644 --- a/celt/mdct.h +++ b/celt/mdct.h @@ -42,6 +42,7 @@ #ifndef MDCT_H #define MDCT_H +#include "opus_defines.h" #include "kiss_fft.h" #include "arch.h" @@ -49,7 +50,7 @@ typedef struct { int n; int maxshift; const kiss_fft_state *kfft[4]; - const kiss_twiddle_scalar * restrict trig; + const kiss_twiddle_scalar * OPUS_RESTRICT trig; } mdct_lookup; int clt_mdct_init(mdct_lookup *l,int N, int maxshift); @@ -62,6 +63,6 @@ void clt_mdct_forward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar /** Compute a backward MDCT (no scaling) and performs weighted overlap-add (scales implicitly by 1/2) */ void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar *out, - const opus_val16 * restrict window, int overlap, int shift, int stride); + const opus_val16 * OPUS_RESTRICT window, int overlap, int shift, int stride); #endif |