shithub: opus

Info  •  Files  •  Log  •  Branches

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.

--- a/celt/mdct.h

+++ b/celt/mdct.h

@@ -57,12 +57,14 @@

 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

--- a/include/opus_custom.h

+++ b/include/opus_custom.h

@@ -318,7 +318,7 @@

   * 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);

 /**@}*/