diff options
author | Gregory Maxwell <greg@xiph.org> | 2012-07-20 20:08:29 +0400 |
---|---|---|
committer | Gregory Maxwell <greg@xiph.org> | 2012-07-21 02:02:55 +0400 |
commit | de4a2ddd06200e24b91b3270dfed02d5e31314c0 (patch) | |
tree | b2bf7b5ac33730c64356b19237d3b578f6b7541b | |
parent | 22f7788ac1b5b7c646c93c2597374265a5a5fd8b (diff) |
Replace the remaining instances of restrict with OPUS_RESTRICT.
The usage of restrict in include/opus_custom.h was missed
by the prior commit replacing this keyword with a macro.
Also fixes some prototype/function agreement with respect to
restrict.
-rw-r--r-- | celt/mdct.h | 6 | ||||
-rw-r--r-- | include/opus_custom.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/celt/mdct.h b/celt/mdct.h index 201f28b4..d7218213 100644 --- a/celt/mdct.h +++ b/celt/mdct.h @@ -57,12 +57,14 @@ int clt_mdct_init(mdct_lookup *l,int N, int maxshift); void clt_mdct_clear(mdct_lookup *l); /** Compute a forward MDCT and scale by 4/N, trashes the input array */ -void clt_mdct_forward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar *out, +void clt_mdct_forward(const mdct_lookup *l, kiss_fft_scalar *in, + kiss_fft_scalar * OPUS_RESTRICT out, const opus_val16 *window, int overlap, int shift, int stride); /** 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, +void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, + kiss_fft_scalar * OPUS_RESTRICT out, const opus_val16 * OPUS_RESTRICT window, int overlap, int shift, int stride); #endif diff --git a/include/opus_custom.h b/include/opus_custom.h index d4d33976..e7861d6f 100644 --- a/include/opus_custom.h +++ b/include/opus_custom.h @@ -318,7 +318,7 @@ OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_decode( * by a convenience macro. * @see opus_genericctls */ -OPUS_CUSTOM_EXPORT int opus_custom_decoder_ctl(OpusCustomDecoder * restrict st, int request, ...) OPUS_ARG_NONNULL(1); +OPUS_CUSTOM_EXPORT int opus_custom_decoder_ctl(OpusCustomDecoder * OPUS_RESTRICT st, int request, ...) OPUS_ARG_NONNULL(1); /**@}*/ |